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

Trivial merge