Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 29 Nov 2005 16:06:51 +0000 (08:06 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 29 Nov 2005 16:06:51 +0000 (08:06 -0800)

Trivial merge