Ingo Molnar daab7fc734 Merge commit 'v2.6.36-rc3' into x86/memblock ... Conflicts: arch/x86/kernel/trampoline.c mm/memblock.c Merge reason: Resolve the conflicts, update to latest upstream. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2010-08-31 09:45:46 +02:00
..
boards	Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable	2010-08-06 18:13:19 +01: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	defconfig reduction	2010-08-14 22:26:53 +02:00
drivers	sh: Fix up IORESOURCE_PCI_FIXED usage in pcibios_fixup_device_resources().	2010-06-07 11:42:01 +09:00
include	Merge commit 'v2.6.36-rc3' into x86/memblock	2010-08-31 09:45:46 +02:00
kernel	Make do_execve() take a const filename pointer	2010-08-17 18:07:43 -07: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	memblock/sh: Use new accessors	2010-08-04 14:38:59 +10:00
oprofile	sh: oprofile: Fix up count size mismatch for common impl.	2009-11-05 17:13:15 +09:00
tools	Merge branch 'sh/stable-updates'	2010-01-18 20:47:37 +09:00
Kconfig	time: Kill off CONFIG_GENERIC_TIME	2010-07-27 12:40:54 +02: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