Russell King 4ec3eb1363 Merge branch 'smp' into misc ... Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c		2011-01-06 22:32:03 +00:00
..
asm	Merge branch 'smp' into misc	2011-01-06 22:32:03 +00:00
cpu-common/cpu
cpu-sh2/cpu
cpu-sh2a/cpu
cpu-sh3/cpu	sh: Fix up the SH-3 build.	2010-10-07 02:57:39 +09:00
cpu-sh4/cpu	sh: pinmux support for SH-X3 proto CPUs.	2010-10-02 19:20:51 +09:00
cpu-sh5/cpu
mach-common/mach	sh: mach-edosk7705: Kill off machtype, consolidate board def.	2010-10-29 19:38:19 +09:00
mach-dreamcast/mach
mach-ecovec24/mach
mach-kfr2r09/mach	sh: add a parameter to LCDC driver's .display_on() callback	2010-08-04 16:12:11 +09:00
mach-landisk/mach
mach-migor/mach
mach-sdk7786/mach	sh: mach-sdk7786: Add support for the FPGA SRAM.	2010-10-15 02:13:04 +09:00
mach-se/mach
mach-sh03/mach
mach-x3proto/mach	sh: mach-x3proto: Support for baseboard GPIOs.	2010-10-04 02:59:29 +09:00