Merge branch 'master' into for-davem

Conflicts:
	drivers/net/wireless/ath/ath9k/phy.c
	drivers/net/wireless/iwlwifi/iwl-6000.c
	drivers/net/wireless/iwlwifi/iwl-debugfs.c

diff --cc drivers/net/wireless/ath/ath5k/base.c
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl3945-base.c
Simple merge

diff --cc drivers/net/wireless/iwmc3200wifi/rx.c
Simple merge

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

diff --cc drivers/net/wireless/libertas/if_sdio.c
Simple merge

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

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

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

diff --cc drivers/net/wireless/orinoco/wext.c
Simple merge

diff --cc drivers/net/wireless/p54/p54pci.c
Simple merge

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

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

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

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

diff --cc drivers/net/wireless/wl12xx/wl1251_main.c
Simple merge

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

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

diff --cc net/mac80211/agg-tx.c
index 555c6a14a6fad84ea783b89317871fed5b2db9d5,7dfe833d9716fd4683e0bf67c0bf1c8692aa6283..c163d0a149f49be05b07fa879562f2d821004beb
--- 1/net/mac80211/agg-tx.c
--- 2/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@@ -184,9 -183,10 +184,9 @@@ static void sta_addba_resp_timer_expire
                       HT_AGG_STATE_REQ_STOP_BA_MSK)) !=
                                                HT_ADDBA_REQUESTED_MSK) {
                spin_unlock_bh(&sta->lock);
 -              *state = HT_AGG_STATE_IDLE;
  #ifdef CONFIG_MAC80211_HT_DEBUG
                printk(KERN_DEBUG "timer expired on tid %d but we are not "
-                               "(or no longer) expecting addBA response there",
+                               "(or no longer) expecting addBA response there\n",
                        tid);
  #endif
                return;

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

diff --cc net/mac80211/driver-ops.h
Simple merge

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

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

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