Merge remote-tracking branch 'net-next/master'

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

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

diff --cc drivers/net/ethernet/nvidia/forcedeth.c
Simple merge

diff --cc drivers/net/ethernet/xilinx/ll_temac_main.c
Simple merge

diff --cc drivers/s390/net/qeth_l3_main.c
Simple merge

diff --cc drivers/virtio/virtio_pci.c
Simple merge

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