Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 17 Aug 2005 20:09:38 +0000 (13:09 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 17 Aug 2005 20:09:38 +0000 (13:09 -0700)

Trivial merge