Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 21 Nov 2005 18:46:34 +0000 (10:46 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 21 Nov 2005 18:46:34 +0000 (10:46 -0800)

Trivial merge