Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 23:58:53 +0000 (16:58 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 6 Jun 2005 23:58:53 +0000 (16:58 -0700)

Trivial merge