Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2...
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 26 Apr 2005 14:19:05 +0000 (07:19 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 26 Apr 2005 14:19:05 +0000 (07:19 -0700)

Trivial merge