Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git