Linux 3.4.46

Conflicts:

	arch/powerpc/include/asm/rtas.h
	arch/powerpc/kernel/rtas.c
	arch/powerpc/platforms/pseries/suspend.c