Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 13 Jan 2016 05:22:13 +0000 (00:22 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Jan 2016 05:22:13 +0000 (00:22 -0500)

Trivial merge