Just did a directly merge from asm-ppc into asm-powerpc.  This is the last
header that we directly include from asm-powerpc.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>