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

Conflicts:
	drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c

diff --cc drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
index 1841312,73fe8d6..491305c
--- 1/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
--- 2/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
+++ b/drivers/net/wireless/ath/ath9k/dfs_pattern_detector.c
@@@ -143,9 -142,8 +143,9 @@@ channel_detector_create(struct dfs_patt
  {
        u32 sz, i;
        struct channel_detector *cd;
 +      struct ath_common *common = ath9k_hw_common(dpd->ah);
  
-       cd = kmalloc(sizeof(*cd), GFP_KERNEL);
+       cd = kmalloc(sizeof(*cd), GFP_ATOMIC);
        if (cd == NULL)
                goto fail;
  

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

diff --cc drivers/net/wireless/b43/phy_n.c
Simple merge

diff --cc drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
Simple merge

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

diff --cc drivers/ssb/driver_chipcommon_pmu.c
Simple merge

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

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