Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

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

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

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

diff --cc drivers/net/wireless/iwlwifi/mvm/mac80211.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/mvm.h
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/scan.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/mvm/utils.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
Simple merge

diff --cc drivers/net/wireless/rt2x00/rt2x00mac.c
Simple merge

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

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

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

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

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

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

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

diff --cc net/wireless/scan.c
index 0f5da18cc6193b648a4a05f19aa6fe7627f5adbf,88f108edfb586ef3b2d17d15cf66b00da84f93f0..e7329bb6a323c95d0a3297f9fc928780f9bc7f66
--- 1/net/wireless/scan.c
--- 2/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@@ -284,14 -284,22 +284,22 @@@ void cfg80211_sched_scan_results(struc
  }
  EXPORT_SYMBOL(cfg80211_sched_scan_results);
  
- void cfg80211_sched_scan_stopped(struct wiphy *wiphy)
+ void cfg80211_sched_scan_stopped_rtnl(struct wiphy *wiphy)
  {
 -      struct cfg80211_registered_device *rdev = wiphy_to_dev(wiphy);
 +      struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy);
  
+       ASSERT_RTNL();
+ 
        trace_cfg80211_sched_scan_stopped(wiphy);
  
-       rtnl_lock();
        __cfg80211_stop_sched_scan(rdev, true);
+ }
+ EXPORT_SYMBOL(cfg80211_sched_scan_stopped_rtnl);
+ 
+ void cfg80211_sched_scan_stopped(struct wiphy *wiphy)
+ {
+       rtnl_lock();
+       cfg80211_sched_scan_stopped_rtnl(wiphy);
        rtnl_unlock();
  }
  EXPORT_SYMBOL(cfg80211_sched_scan_stopped);

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