Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 25 Jun 2005 17:25:13 +0000 (10:25 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sat, 25 Jun 2005 17:25:13 +0000 (10:25 -0700)

Trivial merge