Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 22:01:23 +0000 (14:01 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 5 Jan 2006 22:01:23 +0000 (14:01 -0800)
commit6e2324e0fbb3a075382359b1cbc392a3f4ec8792
tree3f2095838900eca866ce0d2dbe6b0b18aadf0df9
parente8eaedf2f8b368c26aa31a5a5a623b6867ef7f2b
parent5b373e10aeadc2599c085a3357b7fad8b8e760b8
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6