Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Dec 2005 18:11:50 +0000 (10:11 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 23 Dec 2005 18:11:50 +0000 (10:11 -0800)
commit8f43d8e1147406901b7d972d1b528d94def23b0e
tree8e0667ce322b79c6a9aade51dc9739f3dc9430fe
parent7b3dad3d854654e470a598d361919ebdb858f37b
parent597d1f0622d21ffe54aceef8da9682e776f51cc2
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6