Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Wed, 10 Aug 2005 19:21:25 +0000 (12:21 -0700)]

Trivial merge