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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/Makefile
Simple merge

diff --cc drivers/net/ethernet/apm/xgene/xgene_enet_main.c
Simple merge

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

diff --cc drivers/net/ethernet/freescale/fec_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/intel/ixgbevf/ixgbevf_main.c
Simple merge

diff --cc drivers/net/ethernet/sfc/ef10.c
Simple merge

diff --cc drivers/net/phy/fixed_phy.c
Simple merge

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

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

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

diff --cc net/core/skbuff.c
Simple merge

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