Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 10 Jan 2006 21:44:43 +0000 (13:44 -0800)]

Trivial merge