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)
commit05f6ece6f37f987e9de643f6f76e8fb5d5b9e014
tree5244e85d0dfb2619b0af4bc80a2c99dd579f79a5
parent35d138ae22f826f95f0f8d0285947582ccf4508f
parent58b6c58caef7a34eab7ec887288fa495696653e7
Merge /pub/scm/linux/kernel/git/kyle/parisc-2.6