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

Pull in mac80211.git to let the next patch apply
without conflicts, also resolving a hwsim conflict.

Conflicts:
	drivers/net/wireless/mac80211_hwsim.c

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

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

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

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

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

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

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

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

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

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