Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Fri, 12 Aug 2005 16:22:34 +0000 (09:22 -0700)]

Trivial merge