Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 8 Sep 2014 04:41:53 +0000 (21:41 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 Sep 2014 04:41:53 +0000 (21:41 -0700)

Trivial merge