Paul Mundt f862f904d3 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest ... Conflicts: arch/sh/kernel/cpu/sh2a/clock-sh7201.c Signed-off-by: Paul Mundt <lethal@linux-sh.org>		2011-01-06 18:24:07 +09:00
..
asm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest	2011-01-06 18:24:07 +09: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: Add div6_reparent_clks to clock framework for FSI	2010-11-29 12:59:22 +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	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
mach-sdk7786/mach	sh: mach-sdk7786: Handle baseboard NMI source selection.	2010-12-17 18:58: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