Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 7 Nov 2014 03:01:18 +0000 (22:01 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 7 Nov 2014 03:01:18 +0000 (22:01 -0500)

Trivial merge