Merge tag 'powerpc-fixes' of git://github.com/paulusmack/linux into new/master