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

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Simple merge

diff --cc drivers/net/ethernet/ti/davinci_emac.c
Simple merge

diff --cc drivers/net/xen-netfront.c
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc net/caif/caif_socket.c
Simple merge

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

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