Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 26 Aug 2005 23:32:31 +0000 (16:32 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 26 Aug 2005 23:32:31 +0000 (16:32 -0700)

Trivial merge