Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Thu, 15 Dec 2005 02:46:41 +0000 (18:46 -0800)]

Trivial merge