Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 7 Jul 2005 00:04:06 +0000 (17:04 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 7 Jul 2005 00:04:06 +0000 (17:04 -0700)

Trivial merge