Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 29 Jun 2005 04:24:32 +0000 (21:24 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 29 Jun 2005 04:24:32 +0000 (21:24 -0700)

Trivial merge