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

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

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

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

diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge

diff --cc drivers/net/wireless/ath/ath5k/mac80211-ops.c
Simple merge

diff --cc include/linux/Kbuild
Simple merge

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

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

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

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

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

diff --cc net/bluetooth/hci_event.c
Simple merge

diff --cc net/bluetooth/hci_sock.c
Simple merge

diff --cc net/bluetooth/l2cap_core.c
Simple merge

diff --cc net/bluetooth/l2cap_sock.c
Simple merge

diff --cc net/bluetooth/rfcomm/sock.c
Simple merge

diff --cc net/bluetooth/sco.c
Simple merge

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

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

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

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

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

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

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

diff --cc net/sctp/socket.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge