Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 22 Jul 2005 23:33:00 +0000 (16:33 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 22 Jul 2005 23:33:00 +0000 (16:33 -0700)

Trivial merge