Merge remote-tracking branch 'powerpc-mpe/next'

diff --cc arch/powerpc/include/asm/rtas.h
Simple merge

diff --cc arch/powerpc/kernel/cputable.c
Simple merge

diff --cc arch/powerpc/platforms/pseries/mobility.c
Simple merge