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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 5 Apr 2011 12:21:38 +1000

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/rtlwifi/efuse.c between commit 2e3e66e3bbcd
("rtlwifi: Fix some warnings/bugs") from the wireless-current tree and
commit 324732848c42 ("rtlwifi: Remove unused/unneeded variables") from
the wireless tree.

The latter removes the line that the former modified, so I did that.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/