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
..
alpha	alpha: fix compile errors in dma-mapping-common.h	2010-03-18 22:35:28 -04:00
arm	ARM: 6006/1: ARM: Use the correct NOP size in memmove for Thumb-2 kernel builds	2010-03-29 17:33:33 +01:00
avr32	avr32: use generic ptrace_resume code	2010-03-12 15:52:38 -08:00
blackfin	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin	2010-03-18 17:02:35 -07:00
cris	frv/chris: fix lines with a missing semicolons	2010-03-29 09:37:14 -07:00
frv	frv/chris: fix lines with a missing semicolons	2010-03-29 09:37:14 -07:00
h8300	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
ia64	ACPI: processor: driver doesn't need to evaluate _PDC	2010-03-14 21:17:22 -04:00
m32r	m32r: use generic ptrace_resume code	2010-03-12 15:52:39 -08:00
m68k	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
m68knommu	m68knommu: use generic ptrace_resume code	2010-03-12 15:52:38 -08:00
microblaze	microblaze: Support word copying in copy_tofrom_user	2010-04-01 08:38:25 +02:00
mips	init dynamic bin_attribute structures	2010-03-14 20:28:39 -07:00
mn10300	dma-mapping: mn10300: remove the obsolete and unnecessary DMA API comments	2010-03-12 15:52:42 -08:00
parisc	pci-dma: add linux/pci-dma.h to linux/pci.h	2010-03-12 15:52:42 -08:00
powerpc	Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-04-04 12:13:10 -07:00
s390	[S390] fix boot failures with compressed kernels	2010-03-24 11:49:54 +01:00
score	ptrace: move user_enable_single_step & co prototypes to linux/ptrace.h	2010-03-12 15:52:38 -08:00
sh	sh: Do not try merging two 128MB PMB mappings	2010-04-25 20:44:23 +01:00
sparc	sparc64: Implement perf_arch_fetch_caller_regs	2010-04-03 23:50:59 -07:00
um	um: remove dma_sync_single_range	2010-03-12 15:52:40 -08:00
x86	perf, x86: Fix callgraphs of 32-bit processes on 64-bit kernels	2010-04-02 19:30:03 +02:00
xtensa	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-03-12 16:04:50 -08:00
.gitignore	…
Kconfig	Merge branch 'perf-probes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-03-05 10:50:22 -08:00