Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 06:11:50 +0000 (23:11 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Thu, 23 Jun 2005 06:11:50 +0000 (23:11 -0700)

Trivial merge