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

diff --cc drivers/net/wireless/iwlwifi/dvm/rs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-drv.c
Simple merge

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

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

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

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

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

diff --cc net/mac80211/mlme.c
index ad9bb9e,741448b..9e49f55
--- 1/net/mac80211/mlme.c
--- 2/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -2643,12 -2743,16 +2713,15 @@@ static bool ieee80211_assoc_success(str
        ieee80211_sta_rx_notify(sdata, (struct ieee80211_hdr *)mgmt);
        ieee80211_sta_reset_beacon_monitor(sdata);
  
-       return true;
+       ret = true;
+  out:
+       kfree(bss_ies);
+       return ret;
  }
  
 -static enum rx_mgmt_action __must_check
 -ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
 -                           struct ieee80211_mgmt *mgmt, size_t len,
 -                           struct cfg80211_bss **bss)
 +static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
 +                                       struct ieee80211_mgmt *mgmt,
 +                                       size_t len)
  {
        struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
        struct ieee80211_mgd_assoc_data *assoc_data = ifmgd->assoc_data;

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