Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net...
authorSimon Horman <horms@verge.net.au>
Thu, 13 Jan 2011 01:29:21 +0000 (10:29 +0900)
committerSimon Horman <horms@verge.net.au>
Thu, 13 Jan 2011 01:29:21 +0000 (10:29 +0900)

Trivial merge