Hugh Dickins adf213c438 powerpc: Allow 256kB pages with SHMEM ...

Now that shmem's divisions by zero and SHMEM_MAX_BYTES are fixed,
let powerpc 256kB pages coexist with CONFIG_SHMEM again.

Signed-off-by: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

2009-04-15 15:23:53 +10:00

..

alpha

Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 11:04:19 -07:00

arm

Merge branch 'for-next' of git://git.o-hand.com/linux-mfd

2009-04-05 11:38:37 -07:00

avr32

Merge branch 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

2009-04-05 11:15:28 -07:00

blackfin

Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 11:04:19 -07:00

cris

Merge branch 'for-linus' of git://repo.or.cz/cris-mirror

2009-04-05 11:36:31 -07:00

frv

Simplify copy_thread()

2009-04-02 19:04:51 -07:00

h8300

Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 11:04:19 -07:00

ia64

Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 11:04:19 -07:00

m32r

Simplify copy_thread()

2009-04-02 19:04:51 -07:00

m68k

Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 11:04:19 -07:00

m68knommu

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

2009-04-03 09:44:58 -07:00

mips

Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 11:04:19 -07:00

mn10300

Simplify copy_thread()

2009-04-02 19:04:51 -07:00

parisc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

2009-04-03 09:52:04 -07:00

powerpc

powerpc: Allow 256kB pages with SHMEM

2009-04-15 15:23:53 +10:00

s390

Merge branch 'ipi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-03 17:33:30 -07:00

sh

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

2009-04-05 11:15:54 -07:00

sparc

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask

2009-04-05 10:33:07 -07:00

um

Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 11:04:19 -07:00

x86

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

2009-04-05 11:16:25 -07:00

xtensa

Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2009-04-05 11:04:19 -07:00

.gitignore

…

Kconfig

Merge branch 'tracing/core-v2' into tracing-for-linus

2009-04-02 00:49:02 +02:00