Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 3 Dec 2005 07:09:38 +0000 (23:09 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 3 Dec 2005 07:09:38 +0000 (23:09 -0800)

Trivial merge