Paul Mundt 4cb40f795a Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/kernel-parameters.txt arch/sh/include/asm/elf.h		2008-10-20 11:17:52 +09:00
..
asm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-20 11:17:52 +09:00
cpu-common/cpu	sh: Allow SH-3 and SH-5 to use common headers.	2008-07-29 22:52:49 +09:00
cpu-sh2/cpu	SH2(A) cache update	2008-08-04 16:33:47 +09:00
cpu-sh2a/cpu	SH2(A) cache update	2008-08-04 16:33:47 +09:00
cpu-sh3/cpu	fix SH7705_CACHE_32KB compilation	2008-08-11 20:17:49 +09:00
cpu-sh4/cpu	sh: migrate to arch/sh/include/	2008-07-29 08:09:44 +09:00
cpu-sh5/cpu	sh: Allow SH-3 and SH-5 to use common headers.	2008-07-29 22:52:49 +09:00
mach-dreamcast/mach	sh: More header path fixups for mach dir refactoring.	2008-07-29 22:10:01 +09:00
mach-landisk/mach	sh: migrate to arch/sh/include/	2008-07-29 08:09:44 +09:00
mach-se/mach	sh: Move out the solution engine headers to arch/sh/include/mach-se/	2008-07-29 21:41:37 +09:00
mach-sh03/mach	sh: migrate to arch/sh/include/	2008-07-29 08:09:44 +09:00