Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Dec 2005 23:49:45 +0000 (15:49 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Dec 2005 23:49:45 +0000 (15:49 -0800)

Trivial merge