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)
commit8ed575904373d7aaab7f15a8db2edc317a44df43
tree3b2e92a396a1bbec8e1fb499f25e8aed93ab5692
parent27d1097d39509494706eaa2620ef3b1e780a3224
parent210cc679faf0e1cabda9fc5d1279644f5e52aecb
Merge branch 'forlinus' of git://parisc-linux.org/home/kyle/git/parisc-2.6