Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 4 Feb 2006 02:17:47 +0000 (18:17 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 4 Feb 2006 02:17:47 +0000 (18:17 -0800)
commit89a2fa5f2139be35e214bcf86a8291d6a1da75f2
tree850ea412b013360bcace751db91cac6fb0067535
parent27266a18dc56611e2f2ec4e8aced0fe221e9b4b8
parent68ee3eb8295c9c164071fcbd367c419121bd55f8
Merge /pub/scm/linux/kernel/git/kyle/parisc-2.6