Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Thu, 26 Jun 2014 05:40:43 +0000 (22:40 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Jun 2014 05:40:43 +0000 (22:40 -0700)

Trivial merge