Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 9 Feb 2015 22:35:57 +0000 (14:35 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Feb 2015 22:35:57 +0000 (14:35 -0800)
Signed-off-by: David S. Miller <davem@davemloft.net>

Trivial merge