Stupidly, I had speculatively pulled wireless.git into wireless-next.git. Having rebased one, now I have to rebase the other... In particular, I know that the NFC tree will be affected by this. Other trees may be as well, particularly any with pending pull requests that may have rebased on wireless-next in the past week or so. Please be aware and adjust your trees now if possible. Again, sorry for the confusion... John On Mon, Jul 09, 2012 at 03:03:18PM -0400, John W. Linville wrote: > Actually, I took the opportunity to consolidate Thomas Huehn's two > patches (one of which fixes the other). So the actual base is from > c9015b24 now. > > Sorry for the added confusion... > > On Mon, Jul 09, 2012 at 02:46:07PM -0400, John W. Linville wrote: > > I had to drop a patch. Everything up to 0a08adeb stays the same, so if > > you don't already have that then you should still be able to just pull. > > > > Sorry for the inconvenience! > > > > 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 > > > > -- > 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 > -- 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