Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 25 Jul 2005 03:38:44 +0000 (20:38 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 25 Jul 2005 03:38:44 +0000 (20:38 -0700)

Trivial merge