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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/include/asm/Kbuild
Simple merge

diff --cc arch/xtensa/include/asm/Kbuild
Simple merge

diff --cc drivers/bluetooth/ath3k.c
Simple merge

diff --cc drivers/bluetooth/btusb.c
Simple merge

diff --cc drivers/net/bonding/bond_3ad.c
Simple merge

diff --cc drivers/net/can/mscan/mpc5xxx_can.c
Simple merge

diff --cc drivers/net/ethernet/8390/hydra.c
Simple merge

diff --cc drivers/net/ethernet/8390/zorro8390.c
Simple merge

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

diff --cc drivers/net/wireless/ath/ath9k/main.c
Simple merge

diff --cc drivers/net/wireless/rtlwifi/pci.c
Simple merge

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

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

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