Merge branch 'parisc' of master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 18 Nov 2005 22:25:40 +0000 (14:25 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 18 Nov 2005 22:25:40 +0000 (14:25 -0800)
commit62ae144f56b61f541193df4a6465c06ee7eb9096
tree913cc058b162c48e6c72d2b016b9e44201b16cee
parentbcd039b230f738243193ef7dbb03298d967b8370
parent2161558fa5bebfeb272493ae91e836b497029023
Merge branch 'parisc' of /linux/kernel/git/kyle/parisc-2.6