Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 11 Jan 2006 05:29:53 +0000 (21:29 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 11 Jan 2006 05:29:53 +0000 (21:29 -0800)

Trivial merge