On Wed, Jul 22, 2009 at 12:00:00PM +1000, Stephen Rothwell wrote: > Hi David, > > Today's linux-next merge of the net tree got a conflict in > net/wireless/scan.c between commit > 9e81eccf199d910e5ea8db377a43478e4eccd033 ("cfg80211: double free in > __cfg80211_scan_done") from the wireless-current tree and commit > 667503ddcb96f3b10211f997fe55907fa7509841 ("cfg80211: fix locking") from > the net tree. > > Overlapping additions. I fixed it up (I think - see below) and can carry > the fix as ncessary. Looks fine, thanks! -- John W. Linville Someday the world will need a hero, and you linville@xxxxxxxxxxxxx might be all we have. Be ready. ¡Viva Honduras Libre! -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html