Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@evo.osdl.org>
Tue, 6 Sep 2005 07:29:52 +0000 (00:29 -0700)
committerLinus Torvalds <torvalds@evo.osdl.org>
Tue, 6 Sep 2005 07:29:52 +0000 (00:29 -0700)

Trivial merge