Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 18:20:49 +0000 (10:20 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 31 Jan 2006 18:20:49 +0000 (10:20 -0800)
commitf7dd16bf3a2e7e29670051a2488d4be1895e408d
tree8778621ad8bf9bec35d285c4a7aa423609771bea
parent951069e311a2a931bf7c9d838db860f90bf14c45
parent22f01da398069e823e79f1209518f0913e05fc47
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6