Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 20 Jan 2006 06:19:26 +0000 (22:19 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 20 Jan 2006 06:19:26 +0000 (22:19 -0800)

Trivial merge