Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 18 Jan 2006 01:32:22 +0000 (17:32 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 18 Jan 2006 01:32:22 +0000 (17:32 -0800)

Trivial merge