Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 11 Oct 2005 23:39:24 +0000 (16:39 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 11 Oct 2005 23:39:24 +0000 (16:39 -0700)

Trivial merge