android_kernel_xiaomi_sm8350/arch/mips/sibyte
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
..
bcm1480 Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
cfe [MIPS] kgdb: Remove existing implementation 2008-07-30 21:54:42 +01:00
common device create: misc: convert device_create_drvdata to device_create 2008-10-16 09:24:43 -07:00
sb1250 Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
swarm mips: use bcd2bin/bin2bcd 2008-10-20 08:52:41 -07:00
Kconfig