Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Thu, 22 Dec 2005 17:41:03 +0000 (09:41 -0800)]

Trivial merge