Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 8 Oct 2014 20:22:22 +0000 (16:22 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Oct 2014 20:22:22 +0000 (16:22 -0400)

Trivial merge