Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 5 Jun 2018 02:23:35 +0000 (22:23 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Jun 2018 02:23:35 +0000 (22:23 -0400)

Trivial merge