Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 into lvs-next-2.6
authorSimon Horman <horms@verge.net.au>
Tue, 9 Sep 2008 23:14:52 +0000 (09:14 +1000)
committerSimon Horman <horms@verge.net.au>
Tue, 9 Sep 2008 23:14:52 +0000 (09:14 +1000)

Trivial merge