Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sun, 3 May 2015 02:05:58 +0000 (22:05 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 3 May 2015 02:05:58 +0000 (22:05 -0400)
commit3715544750e4a250f881254900cccebc57509fde
tree478205aefd34a74a0ed2f236c19291973d519fa4
parent629161f649ca259cfc1473a98347b941dd7a52bc
parent6c3c1eb3c35e8856d6dcb01b412316a676f58bbe
Merge git://git./linux/kernel/git/davem/net

Merge net into net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/rocker/rocker.c
net/ipv4/route.c