Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Thu, 8 Sep 2005 00:20:11 +0000 (17:20 -0700)]

Trivial merge