Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 15 Jan 2016 23:36:23 +0000 (18:36 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 15 Jan 2016 23:36:23 +0000 (18:36 -0500)

Trivial merge