Hi John,
Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c between commit
d61f978b8f26 ("brcmfmac: fix typo in CONFIG_BRCMISCAN") from the tree
and commit f07998959d57 ("brcmfmac: remove obsolete i-scan and clean up
related code") from the wireless-next tree.
I used the latter (which removed the line that was fixed in the former)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpGdyHUtzdC4.pgp
Description: PGP signature
