Recent commits upstream have changed files which are currently
duplicated in arch/powerpc and include/asm-powerpc.  This updates
them with the corresponding changes.
Signed-off-by: Paul Mackerras <paulus@samba.org>