Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Merge net into net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/net/ethernet/rocker/rocker.c
Simple merge

diff --cc net/ipv4/route.c
Simple merge