Messages in this thread | | | Date | Tue, 9 Feb 2010 13:24:44 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net tree with the wireless-current tree |
| |
Hi all,
Today's linux-next merge of the net tree got a conflict in net/mac80211/scan.c between commit c0ce77b8323c1a0d4eeef97caf16c0ea971222a9 ("mac80211: fix deferred hardware scan requests") from the wireless-current tree and commit af6b63741cc4e4dfd575d06beb333b11a8a6e0c0 ("mac80211: generalise work handling") from the net tree.
I resolved this the same way it is resolved in the merge of the wireless-current tree into the wireless tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |