Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 3 Jun 2005 00:39:49 +0000 (17:39 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 3 Jun 2005 00:39:49 +0000 (17:39 -0700)

Trivial merge