Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 24 Dec 2005 20:30:42 +0000 (12:30 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 24 Dec 2005 20:30:42 +0000 (12:30 -0800)

Trivial merge