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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-tx.c
	net/mac80211/sta_info.h

diff --cc MAINTAINERS
Simple merge

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

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

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-tx.c
index 4afae144658296c31625dba650c541bd527908dc,7c1becf9e2c15343ab8da99ee27da9745d3eeeec..342de780a3661dd08f8c41e79eaacfa0f3dbe356
--- 1/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
--- 2/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-tx.c
@@@ -582,17 -580,12 +580,17 @@@ int iwlagn_tx_skb(struct iwl_priv *priv
  
        hdr_len = ieee80211_hdrlen(fc);
  
 -      /* Find index into station table for destination station */
 -      sta_id = iwl_sta_id_or_broadcast(priv, ctx, info->control.sta);
 -      if (sta_id == IWL_INVALID_STATION) {
 -              IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
 -                             hdr->addr1);
 -              goto drop_unlock_priv;
 +      /* For management frames use broadcast id to do not break aggregation */
 +      if (!ieee80211_is_data(fc))
 +              sta_id = ctx->bcast_sta_id;
 +      else {
 +              /* Find index into station table for destination station */
 +              sta_id = iwl_sta_id_or_broadcast(priv, ctx, info->control.sta);
 +              if (sta_id == IWL_INVALID_STATION) {
 +                      IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",
 +                                     hdr->addr1);
-                       goto drop_unlock;
++                      goto drop_unlock_priv;
 +              }
        }
  
        IWL_DEBUG_TX(priv, "station Id %d\n", sta_id);

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

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

diff --cc drivers/net/wireless/rt2x00/rt2800.h
Simple merge

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

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

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

diff --cc drivers/net/wireless/wl12xx/conf.h
Simple merge

diff --cc include/linux/nl80211.h
Simple merge

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

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

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

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

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

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

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

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

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

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