linux-next: manual merge of the wireless tree with thewireless-current tree
From: Stephen Rothwell
Date: Mon Apr 04 2011 - 22:21:54 EST
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.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature