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

diff --cc drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
Simple merge

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

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

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