On Wed, Oct 02, 2013 at 11:41:44AM +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. > > I'm rebasing my tree on -rc1, which actually includes the merge commit, > so it still makes sense for me to include this commit - I've done that > now. Sorry for the confusion. I'm not sure I follow -- please don't base on anything I don't already have in my tree if you want me to pull from you. I applied the patch to wireless-next today, FWIW. John -- John W. Linville Someday the world will need a hero, and you linville@xxxxxxxxxxxxx might be all we have. Be ready. -- 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
