Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Fri, 5 Aug 2005 14:49:30 +0000 (07:49 -0700)]

Trivial merge