Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 2 Feb 2016 02:44:07 +0000 (18:44 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Feb 2016 02:44:07 +0000 (18:44 -0800)

Trivial merge