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
..
boards	Merge branch 'sh/gpiolib'	2008-10-20 10:40:32 +09:00
boot	sh: ftrace support.	2008-09-21 16:43:45 +09:00
cchips	sh: Kill off more dead symbols.	2008-02-14 14:22:12 +09:00
configs	sh: update edosk7760 defconfig for physmap-flash.	2008-09-12 18:08:01 +09:00
drivers	sh: Move out the solution engine headers to arch/sh/include/mach-se/	2008-07-29 21:41:37 +09:00
include	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
kernel	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
lib	sh: Fix up the __raw_read/writeX() definitions.	2008-10-01 15:12:27 +09:00
lib64	sh: migrate to arch/sh/include/	2008-07-29 08:09:44 +09:00
math-emu	sh: Fix up the math-emu build.	2007-06-11 15:57:42 +09:00
mm	Fix debugfs_create_file's error checking method for arch/sh/mm/	2008-10-20 10:40:21 +09:00
oprofile	sh: Add -Werror for clean directories.	2007-11-07 11:13:55 +09:00
tools	sh: Add EDOSK7760 mach type.	2008-09-08 12:01:55 +09:00
Kconfig	sh: GPIO and pinmux base code	2008-10-20 10:33:50 +09:00
Kconfig.cpu	sh: Disable big endian for SH-5.	2008-02-14 14:22:10 +09:00
Kconfig.debug	sh: Disable 4kB stacks when using PAGE_SIZE_64KB.	2008-09-20 20:16:35 +09:00
Makefile	sh: Provide a fixed UTS_MACHINE definition for sh64.	2008-09-12 18:58:28 +09:00