Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Mon, 25 Jul 2005 03:39:30 +0000 (20:39 -0700)]

Trivial merge