Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 16 Jul 2014 21:09:34 +0000 (14:09 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Jul 2014 21:09:34 +0000 (14:09 -0700)
Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge