On Mon, 2013-09-30 at 16:32 -0400, John W. Linville wrote: > On Mon, Sep 30, 2013 at 11:07:54AM +0200, Johannes Berg wrote: > > On Mon, 2013-09-30 at 11:02 +0200, Johannes Berg wrote: > > > From: Johannes Berg <johannes.berg@xxxxxxxxx> > > > > > > The merge b35c8097 seems to have lost commit eabc4ac5d, > > > put the code back. > > > > > > Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> > > > > Ah, forgot to say - John, I think you should apply this as a patch, > > having it in my pull request seems odd. But if you're of another opinion > > I can stick it into my next -next pull request too. > > OK -- does this need to be treated as a fix? Or is -next OK? I believe the merge damage only occurred during merging wireless.git (or one of its upstreams) into wireless-next.git. johannes -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
