]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)

Trivial merge