Merge rsync://rsync.kernel.org/pub/linux/kernel/people/davem/sparc-2.6.git
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 21 Apr 2005 14:36:42 +0000 (07:36 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 21 Apr 2005 14:36:42 +0000 (07:36 -0700)

Trivial merge