Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 9 Jun 2015 03:06:56 +0000 (20:06 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Jun 2015 03:06:56 +0000 (20:06 -0700)

Trivial merge