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

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/can/c_can/c_can_platform.c
Simple merge

diff --cc drivers/net/ethernet/amd/xgbe/xgbe-main.c
Simple merge

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

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

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

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

diff --cc drivers/net/hyperv/netvsc.c
Simple merge

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

diff --cc drivers/net/usb/r8152.c
Simple merge

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

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

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