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

Conflicts:
	net/mac80211/mlme.c

diff --cc drivers/bluetooth/btmrvl_sdio.c
Simple merge

diff --cc drivers/bluetooth/btusb.c
Simple merge

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

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

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

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

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

diff --cc drivers/net/wireless/iwlegacy/4965-mac.c
Simple merge

diff --cc drivers/net/wireless/iwlegacy/common.c
Simple merge

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

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

diff --cc drivers/net/wireless/mwifiex/cfg80211.c
Simple merge

diff --cc drivers/net/wireless/mwifiex/ie.c
Simple merge

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

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

diff --cc net/mac80211/mlme.c
index f1a80da4e56ac6dacb384034aceb20329b6bc69e,0db5d34a06b69c8c72798a8a7d4e6c4f642f7560..aa69a331f374bceb37258c76bd681f247508f863
--- 1/net/mac80211/mlme.c
--- 2/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -2149,19 -2170,17 +2148,17 @@@ ieee80211_rx_mgmt_assoc_resp(struct iee
        *bss = assoc_data->bss;
  
        if (status_code != WLAN_STATUS_SUCCESS) {
 -              printk(KERN_DEBUG "%s: %pM denied association (code=%d)\n",
 -                     sdata->name, mgmt->sa, status_code);
 +              sdata_info(sdata, "%pM denied association (code=%d)\n",
 +                         mgmt->sa, status_code);
                ieee80211_destroy_assoc_data(sdata, false);
        } else {
-               sdata_info(sdata, "associated\n");
- 
                if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) {
                        /* oops -- internal error -- send timeout for now */
-                       ieee80211_destroy_assoc_data(sdata, true);
-                       sta_info_destroy_addr(sdata, mgmt->bssid);
+                       ieee80211_destroy_assoc_data(sdata, false);
                        cfg80211_put_bss(*bss);
                        return RX_MGMT_CFG80211_ASSOC_TIMEOUT;
                }
 -              printk(KERN_DEBUG "%s: associated\n", sdata->name);
++              sdata_info(sdata, "associated\n");
  
                /*
                 * destroy assoc_data afterwards, as otherwise an idle

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

diff --cc net/nfc/llcp/sock.c
Simple merge