Merge branch 'merge'

Documentation/powerpc/booting-without-of.txt

arch/powerpc/Kconfig

arch/powerpc/boot/dts/mpc8540ads.dts

arch/powerpc/boot/dts/mpc8541cds.dts

arch/powerpc/boot/dts/mpc8548cds.dts

arch/powerpc/boot/dts/mpc8555cds.dts

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_ppc970.S

arch/powerpc/kernel/crash.c

arch/powerpc/kernel/irq.c

arch/powerpc/kernel/kprobes.c

arch/powerpc/kernel/legacy_serial.c

arch/powerpc/kernel/machine_kexec.c

arch/powerpc/kernel/machine_kexec_64.c

arch/powerpc/kernel/prom_parse.c

arch/powerpc/kernel/time.c