Merge commit 'jwb/next' into next

arch/powerpc/Kconfig

arch/powerpc/boot/dts/canyonlands.dts

arch/powerpc/boot/dts/redwood.dts

arch/powerpc/configs/44x/canyonlands_defconfig

arch/powerpc/configs/44x/redwood_defconfig

arch/powerpc/include/asm/highmem.h

arch/powerpc/include/asm/mmu-44x.h

arch/powerpc/include/asm/page.h

arch/powerpc/include/asm/page_32.h

arch/powerpc/include/asm/thread_info.h

arch/powerpc/kernel/cpu_setup_44x.S

arch/powerpc/kernel/cputable.c

arch/powerpc/kernel/head_booke.h

arch/powerpc/platforms/44x/Kconfig

arch/powerpc/platforms/44x/ppc44x_simple.c

arch/powerpc/sysdev/ppc4xx_pci.c