android_kernel_xiaomi_sm8350/arch/cris/arch-v32
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
..
drivers CRISv32: Fix typo compile error in ARTPEC-3 gpio driver. 2009-04-28 19:08:10 +02:00
kernel Merge branch 'linus' into irq/numa 2009-06-01 21:06:21 +02:00
lib [CRIS] Move header files from include to arch/cris/include. 2008-10-29 17:29:44 +01:00
mach-a3 [CRIS] Move header files from include to arch/cris/include. 2008-10-29 17:29:44 +01:00
mach-fs trivial: fix typos/grammar errors in Kconfig texts 2009-03-30 15:22:01 +02:00
mm cpumask: use mm_cpumask() wrapper: cris 2009-03-16 14:11:47 +10:30
Kconfig trivial: fix typos/grammar errors in Kconfig texts 2009-03-30 15:22:01 +02:00
output_arch.ld