Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 4 Oct 2005 20:55:22 +0000 (13:55 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 4 Oct 2005 20:55:22 +0000 (13:55 -0700)

Trivial merge