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

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

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

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

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

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge

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

diff --cc drivers/net/wireless/iwlwifi/pcie/trans.c
index b849528,1eabb83..969f78f
--- 1/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
--- 2/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@@ -1351,10 -1317,10 +1317,10 @@@ static int iwl_trans_pcie_tx(struct iwl
        iwl_trans_txq_update_byte_cnt_tbl(trans, txq, le16_to_cpu(tx_cmd->len));
  
        dma_sync_single_for_device(trans->dev, txcmd_phys, firstlen,
-                       DMA_BIDIRECTIONAL);
+                                  DMA_BIDIRECTIONAL);
  
        trace_iwlwifi_dev_tx(trans->dev,
 -                           &((struct iwl_tfd *)txq->tfds)[txq->q.write_ptr],
 +                           &txq->tfds[txq->q.write_ptr],
                             sizeof(struct iwl_tfd),
                             &dev_cmd->hdr, firstlen,
                             skb->data + hdr_len, secondlen);

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

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

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