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

Trivial merge