Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 28 Aug 2015 04:45:31 +0000 (21:45 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 28 Aug 2015 04:45:31 +0000 (21:45 -0700)

Trivial merge