Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 23 Aug 2005 18:06:56 +0000 (11:06 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 23 Aug 2005 18:06:56 +0000 (11:06 -0700)

Trivial merge