Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 22 Aug 2012 21:21:38 +0000 (14:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Aug 2012 21:21:38 +0000 (14:21 -0700)

Trivial merge