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>
Mon, 6 Oct 2008 21:40:11 +0000 (08:40 +1100)
committerSimon Horman <horms@verge.net.au>
Mon, 6 Oct 2008 21:40:11 +0000 (08:40 +1100)

Trivial merge