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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 19 Sep 2011 15:14:34 +1000

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                    [email-masked]
http://www.canb.auug.org.au/~sfr/