Paul Mundt bbcf6e8b66 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: arch/sh/include/asm/Kbuild drivers/Makefile Signed-off-by: Paul Mundt <lethal@linux-sh.org>		2010-08-16 13:32:24 +09:00
..
asm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2010-08-16 13:32:24 +09:00
cpu-common/cpu
cpu-sh2/cpu	sh: Mass ctrl_in/outX to __raw_read/writeX conversion.	2010-01-26 12:58:40 +09:00
cpu-sh2a/cpu
cpu-sh3/cpu	dmaengine: shdma: separate DMA headers.	2010-03-02 11:09:04 +09:00
cpu-sh4/cpu	sh: modify pinmux for SH7757 2nd cut	2010-07-06 17:38:29 +09:00
cpu-sh5/cpu
mach-common/mach	sh: SH-2007 board support.	2010-06-21 15:10:51 +09:00
mach-dreamcast/mach	sh: mach-dreamcast: Convert to sparseirq.	2010-02-02 18:01:55 +09:00
mach-ecovec24/mach	sh: add romImage MMCIF boot for sh7724 and Ecovec V2	2010-05-31 13:11:54 +09:00
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	sh: audio support for the sh7722 Migo-R board	2010-03-02 11:08:54 +09:00
mach-sdk7786/mach	sh: mach-sdk7786: pm_power_off support.	2010-04-19 16:27:47 +09:00
mach-se/mach	sh: mach-se: Convert SE7343 FPGA to dynamic IRQ allocation.	2010-01-12 13:37:04 +09:00
mach-sh03/mach