Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Jun 2012 18:25:04 +0000 (14:25 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 12 Jun 2012 18:25:04 +0000 (14:25 -0400)
1  2 
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
drivers/net/wireless/ath/ath9k/eeprom_4k.c
drivers/net/wireless/ath/ath9k/eeprom_def.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/net/wireless/iwlwifi/dvm/testmode.c
drivers/net/wireless/iwlwifi/pcie/trans.c
drivers/net/wireless/mwifiex/scan.c
drivers/net/wireless/ti/wlcore/tx.c
net/mac80211/scan.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);
Simple merge
Simple merge
Simple merge