Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorSimon Horman <horms@verge.net.au>
Tue, 19 Aug 2008 07:36:22 +0000 (17:36 +1000)
committerSimon Horman <horms@verge.net.au>
Tue, 19 Aug 2008 07:36:22 +0000 (17:36 +1000)

Trivial merge