Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Fri, 24 Jun 2005 07:31:46 +0000 (00:31 -0700)]

Trivial merge