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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 7 Apr 2010 12:58:28 +1000

Hi John,

Today's linux-next merge of the wireless tree got conflicts in
drivers/net/wireless/iwlwifi/iwl-core.c,
drivers/net/wireless/iwlwifi/iwl-tx.c and
drivers/net/wireless/iwlwifi/iwl-core.h between commit
de0f60ea94e132c858caa64a44b2012e1e8580b0 ("iwlwifi: avoid Tx queue memory
allocation in interface down") from the wireless-current tree and commit
74bcdb33e99f49ef5202dd2f8109945b4570edc2 ("iwlwifi: move agn only tx
functions from iwlcore to iwlagn") from the wireless tree.

The latter moved the code modified by the former.  I couldn't see any
easy way to fix this up, so I effectively reverted the change in the
wireless-current tree.  Please do the merge fixup, thanks.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/