Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

Documentation/powerpc/booting-without-of.txt

arch/powerpc/Kconfig

arch/powerpc/boot/dts/mpc8641_hpcn.dts

arch/powerpc/configs/g5_defconfig

arch/powerpc/configs/iseries_defconfig

arch/powerpc/configs/pseries_defconfig

arch/powerpc/kernel/Makefile

arch/powerpc/kernel/cpu_setup_power4.S

arch/powerpc/kernel/crash.c

arch/powerpc/kernel/irq.c

arch/powerpc/kernel/kprobes.c

arch/powerpc/kernel/machine_kexec.c

arch/powerpc/kernel/machine_kexec_64.c

arch/powerpc/kernel/rtas.c

arch/powerpc/kernel/traps.c

arch/powerpc/platforms/pseries/setup.c

arch/powerpc/platforms/pseries/xics.c

arch/powerpc/sysdev/fsl_soc.c

include/asm-powerpc/kexec.h

include/asm-powerpc/rtas.h