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)

Trivial merge