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
..
boards	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
boot	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2010-06-04 15:42:09 -07:00
cchips	sh: Fix up hp6xx build.	2010-02-05 17:45:14 +09:00
configs	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
drivers	sh: dma: check return value of create_proc_read_entry()	2010-08-04 16:10:28 +09:00
include	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
kernel	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
lib	arch/sh/lib/strlen.S: Checkpatch cleanup	2010-05-24 08:11:07 +09:00
lib64	sh64: Kill off special clear_page() implementation.	2009-08-04 17:17:00 +09:00
math-emu	Revert "endian: #define __BYTE_ORDER"	2010-05-26 08:30:15 -07:00
mm	sh: Use __GFP_ZERO for dma_generic_alloc_coherent().	2010-08-04 16:38:35 +09:00
oprofile	sh: oprofile: Fix up count size mismatch for common impl.	2009-11-05 17:13:15 +09:00
tools	sh: add sh7757lcr board support	2010-07-06 17:38:32 +09:00
Kconfig	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
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-sdk7786: update defconfig for compressed kernel image.	2010-04-26 17:45:34 +09:00