Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

arch/powerpc/Kconfig

arch/powerpc/Makefile

arch/powerpc/boot/crt0.S

arch/powerpc/configs/ppc64_defconfig

arch/powerpc/configs/pseries_defconfig

arch/powerpc/kernel/Makefile

arch/powerpc/kernel/align.c

arch/powerpc/kernel/idle_64.c

arch/powerpc/kernel/misc_32.S

arch/powerpc/kernel/nvram_64.c

arch/powerpc/kernel/rtas-rtc.c

arch/powerpc/kernel/time.c

arch/powerpc/platforms/chrp/setup.c

arch/powerpc/platforms/chrp/smp.c

arch/powerpc/platforms/chrp/time.c

arch/powerpc/platforms/maple/time.c

arch/powerpc/platforms/pseries/eeh.c

arch/powerpc/platforms/pseries/setup.c

arch/ppc/kernel/Makefile

arch/ppc/kernel/align.c