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

diff --cc drivers/net/wireless/ath/ath10k/htt_rx.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge

diff --cc fs/gfs2/glock.c
Simple merge

diff --cc net/mac80211/ieee80211_i.h
Simple merge

diff --cc net/mac80211/tx.c
Simple merge

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

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

diff --cc net/wireless/nl80211.c
Simple merge

diff --cc net/wireless/sme.c
Simple merge