tmp_suning_uos_patched/arch/mips/sibyte/sb1250
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
..
bus_watcher.c
irq.c Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
Makefile
prom.c smp_call_function: get rid of the unused nonatomic/retry argument 2008-06-26 11:24:35 +02:00
setup.c
smp.c irq: update all arches for new irq_desc, fix 2009-01-15 11:15:36 +01:00
time.c