Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 17 Nov 2005 17:06:54 +0000 (09:06 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 17 Nov 2005 17:06:54 +0000 (09:06 -0800)

Trivial merge