Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 12 Nov 2005 01:00:17 +0000 (17:00 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 12 Nov 2005 01:00:17 +0000 (17:00 -0800)

Trivial merge