linux/arch/cris
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
..
arch-v10 CRIS: Wire up syscalls signalfd4 to writev. 2009-04-28 17:53:35 +02:00
arch-v32 Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
boot CRIS: Merge machine dependent boot/compressed and boot/rescue 2009-04-21 11:44:57 +02:00
configs
include CRIS: Wire up syscalls signalfd4 to writev. 2009-04-28 17:53:35 +02:00
kernel
mm
Kconfig
Kconfig.debug
Makefile CRIS: Merge machine dependent boot/compressed and boot/rescue 2009-04-21 11:44:57 +02:00