Linux 3.4.61

Conflicts:
	arch/powerpc/Kconfig
	arch/powerpc/include/asm/page.h