Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 5 Jul 2012 10:44:25 +0000 (03:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Jul 2012 10:44:25 +0000 (03:44 -0700)

Trivial merge