Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Dec 2005 00:43:57 +0000 (16:43 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Dec 2005 00:43:57 +0000 (16:43 -0800)

Trivial merge