Hi John,
Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/wl12xx/main.c between commit 7a5e4877c14d ("wl12xx:
add max_sched_scan_ssids value to the hw description") from Linus' tree
and commit f952079a19c6 ("wl12xx: add support for multiple SSIDs in
sched_scan") from the wireless tree.
I used the version from the wireless tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpLFBlr0T5mn.pgp
Description: PGP signature
