Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 10 Feb 2006 00:19:06 +0000 (16:19 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 10 Feb 2006 00:19:06 +0000 (16:19 -0800)

Trivial merge