Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 12 Jul 2005 20:16:40 +0000 (13:16 -0700)]

Trivial merge