Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 18 Feb 2015 02:48:51 +0000 (18:48 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Feb 2015 02:48:51 +0000 (18:48 -0800)

Trivial merge