Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2...
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 5 May 2005 23:22:23 +0000 (16:22 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 5 May 2005 23:22:23 +0000 (16:22 -0700)

Trivial merge