From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 23 Apr 2010 18:43:45 +0000 (-0400)
Subject: Merge branch 'master' into for-davem
X-Git-Tag: MMI-PSA29.97-13-9~23873^2~393
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3b51cc996e81d8a113416d8094fa4a88f8360a51;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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
---

3b51cc996e81d8a113416d8094fa4a88f8360a51
diff --cc net/mac80211/agg-tx.c
index 555c6a14a6fa,7dfe833d9716..c163d0a149f4
--- a/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;