linux-next: manual merge of the wireless tree with the wireless-current tree

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c between commit
282cdb325aea ("iwlagn: fix command queue timeout") from the
wireless-current tree and commit 6d8f6eeb3506 ("iwlagn: transport layer
should receive iwl_trans") from the wireless tree.

Just context changes.  I fixed ti up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
index 222d410,ea6a0bc..0000000

--- a/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c

@@@ -771,9 -921,8 +921,10 @@@ void iwl_tx_cmd_complete(struct iwl_pri
  	cmd = txq->cmd[cmd_index];
  	meta = &txq->meta[cmd_index];
  
 +	txq->time_stamp = jiffies;
 +
- 	iwlagn_unmap_tfd(priv, meta, &txq->tfds[index], DMA_BIDIRECTIONAL);
+ 	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) {