Merge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6