Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 26 May 2005 01:01:26 +0000 (18:01 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 26 May 2005 01:01:26 +0000 (18:01 -0700)

Trivial merge