Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorSimon Horman <horms@verge.net.au>
Sat, 16 Aug 2008 04:44:17 +0000 (14:44 +1000)
committerSimon Horman <horms@verge.net.au>
Sat, 16 Aug 2008 04:44:17 +0000 (14:44 +1000)

Trivial merge