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

Merge net into net-next because some upcoming net-next changes
build on top of bug fixes that went into net.

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

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/tg3.c
Simple merge

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

diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge

diff --cc drivers/net/vxlan.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

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

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