Merge branch 'master' of /home/malware/rs6000/linux-ppc/