Merge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 17:08:46 +0000 (10:08 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 28 Oct 2005 17:08:46 +0000 (10:08 -0700)

Trivial merge