Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 11 Jan 2006 05:31:24 +0000 (21:31 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 11 Jan 2006 05:31:24 +0000 (21:31 -0800)

Trivial merge