Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.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 sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp6WD4JnO7j5.pgp
Description: PGP signature
