Paul Mundt 5e93c6b4ec Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest ... Conflicts: arch/arm/mach-shmobile/Kconfig Signed-off-by: Paul Mundt <lethal@linux-sh.org>		2011-01-07 10:29:26 +09:00
..
boards	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-01-06 16:50:35 -08:00
boot	sh: boot kernel with SR.BL set	2010-09-30 09:43:32 +09:00
cchips	sh: hd64461: irq_data conversion.	2010-10-27 15:18:15 +09:00
configs	sh: include Migo-R TS driver in Migo-R defconfig	2011-01-06 17:19:54 +09:00
drivers	sh: machvec IO death.	2010-11-01 09:49:04 -04:00
include	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest	2011-01-07 10:29:26 +09:00
kernel	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-01-06 16:50:35 -08:00
lib	sh: change to new flag variable	2010-09-23 16:18:18 +09:00
lib64	sh64: Kill off special clear_page() implementation.	2009-08-04 17:17:00 +09:00
math-emu	sh: wire up perf alignment and emulation faults.	2010-10-13 06:55:26 +09:00
mm	sh: Assume new page cache pages have dirty dcache lines.	2010-12-01 15:39:51 +09:00
oprofile	sh: oprofile: Make sure the backtrace op is available for timer-fallback.	2010-10-27 17:03:50 +09:00
tools	sh: mach-systemh: Kill off dead board.	2010-10-29 19:11:56 +09:00
Kconfig	Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-01-06 16:50:35 -08:00
Kconfig.cpu	sh: Turn on speculative return for SH7785 and SH7786	2010-02-18 18:54:18 +09:00
Kconfig.debug	sh: Remove old early serial console code V2	2009-12-15 12:07:35 +09:00
Makefile	sh: mach-edosk7705: Kill off machtype, consolidate board def.	2010-10-29 19:38:19 +09:00