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

diff --cc MAINTAINERS
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/intel/igb/igb_main.c
Simple merge

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

diff --cc drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
Simple merge

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

diff --cc drivers/net/wireless/iwlwifi/iwl-fw.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc net/bridge/br_netlink.c
Simple merge

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

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

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

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

diff --cc net/ipv6/ip6_gre.c
Simple merge

diff --cc net/ipv6/ip6_offload.c
Simple merge

diff --cc net/ipv6/ip6_vti.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge