Matt Fleming c7b03fa0bd sh: Do not try merging two 128MB PMB mappings ... There is a logic error in pmb_merge() that means we will incorrectly try to merge two 128MB PMB mappings into one mapping. However, 256MB isn't a valid PMB map size and pmb_merge() will actually drop the second 128MB mapping. This patch allows my SDK7786 board to boot when configured with CONFIG_MEMORY_SIZE=0x10000000. Signed-off-by: Matt Fleming <matt@console-pimps.org>		2010-04-25 20:44:23 +01:00
..
boards	sh: mach-sdk7786: pm_power_off support.	2010-04-19 16:27:47 +09:00
boot	sh: Fix zImage load address when CONFIG_32BIT=y	2010-04-25 20:44:23 +01:00
cchips	sh: Fix up hp6xx build.	2010-02-05 17:45:14 +09:00
configs	sh: Update ecovec_defconfig	2010-03-29 11:37:49 +09:00
drivers	Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6	2010-02-26 16:54:27 -08:00
include	sh: Assembly friendly __pa and __va definitions	2010-04-25 20:44:22 +01:00
kernel	sh: __cpuinit annotate the CPU init path.	2010-04-21 12:20:42 +09:00
lib	arch/sh/lib/libgcc.h: Checkpatch cleanup	2010-03-01 11:57:29 +09:00
lib64	sh64: Kill off special clear_page() implementation.	2009-08-04 17:17:00 +09:00
math-emu	sh: Move over to dynamically allocated FPU context.	2010-01-13 12:51:40 +09:00
mm	sh: Do not try merging two 128MB PMB mappings	2010-04-25 20:44:23 +01: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	sh: intc: userimask support.	2010-04-13 14:43:03 +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-titan: Kill off unused PIO port mangling.	2010-01-28 15:08:21 +09:00