Merge remote-tracking branch 'wireless/master'

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-pci.c
	drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
	drivers/net/wireless/rt2x00/rt2800usb.c

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

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

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

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

diff --cc drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
index 222d410c586e4e481a8c474471ed8702e41aac90,ca686dbf5893d3e07ad068eddabab65f784a9018..f6d823f012dba9a5b22f020e18f3b702c5b5f417
--- 1/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
--- 2/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
@@@ -771,9 -925,8 +925,10 @@@ void iwl_tx_cmd_complete(struct iwl_tra
        cmd = txq->cmd[cmd_index];
        meta = &txq->meta[cmd_index];
  
-       iwlagn_unmap_tfd(priv, meta, &txq->tfds[index], DMA_BIDIRECTIONAL);
 +      txq->time_stamp = jiffies;
 +
+       iwlagn_unmap_tfd(trans, meta, &txq->tfds[index],
+                        DMA_BIDIRECTIONAL);
  
        /* Input error checking is done when commands are added to queue. */
        if (meta->flags & CMD_WANT_SKB) {

diff --cc drivers/net/wireless/rt2x00/rt2800usb.c
index dbf501ca317f51cac690b87a0edb7f8a84145353,4b907a53f97c2639df112b2eb857e14ef778166b..1e48340228ec5fffc9c4e8279d959cf6254c3daf
--- 1/drivers/net/wireless/rt2x00/rt2800usb.c
--- 2/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@@ -538,11 -529,13 +538,12 @@@ static void rt2800usb_txdone(struct rt2
                        entry = rt2x00queue_get_entry(queue, Q_INDEX_DONE);
                        if (rt2800usb_txdone_entry_check(entry, reg))
                                break;
 +                      entry = NULL;
                }
  
 -              if (!entry || rt2x00queue_empty(queue))
 -                      break;
 -
 -              rt2800_txdone_entry(entry, reg,
 +              if (entry)
-                       rt2800_txdone_entry(entry, reg);
++                      rt2800_txdone_entry(entry, reg,
+                                   rt2800usb_get_txwi(entry));
        }
  }
  

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

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

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

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

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

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

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

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

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

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