Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 19 May 2005 22:29:23 +0000 (15:29 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 19 May 2005 22:29:23 +0000 (15:29 -0700)

Trivial merge