Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 5 Jul 2005 21:17:40 +0000 (14:17 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 5 Jul 2005 21:17:40 +0000 (14:17 -0700)

Trivial merge