1
linux/arch/mips/sibyte/bcm1480
Ingo Molnar 3d58f48ba0 Merge branch 'linus' into irq/numa
Conflicts:
	arch/mips/sibyte/bcm1480/irq.c
	arch/mips/sibyte/sb1250/irq.c

Merge reason: we gathered a few conflicts plus update to latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-06-01 21:06:21 +02:00
..
irq.c Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
Makefile
setup.c [MIPS] Sibyte: cleanup static inline forward declarations. 2007-10-11 23:46:05 +01:00
smp.c irq: update all arches for new irq_desc, fix 2009-01-15 11:15:36 +01:00
time.c [MIPS] Sibyte: Split and move clock code. 2007-11-02 16:13:47 +00:00