Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 1 Jun 2005 20:20:35 +0000 (13:20 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 1 Jun 2005 20:20:35 +0000 (13:20 -0700)

Trivial merge