On Thu, Apr 24, 2014 at 06:51:13PM -0700, Marcel Holtmann wrote: > Hi John, > > > This tag has a lot of stuff in it not in the wireless tree. > > Please only send me pull requests that only include patches related > > to Bluetooth. > > > >> Some fixes for 3.15. There is a revert for the intel driver, a new device id, > >> and two important SSP fixes from Johan. > >> Also we've noticed that your wireless.git tree is not up to date, so this pull > >> was rebased on top of net.git. If you pull from this you'll will be pulling > >> net/master from yesterday as well. > > as Gustavo explained, this is against net.git since wireless.git has not yet been rebased. > > Regards > > Marcel wireless.git is where it is going to be. It is based from a few dozen commits before -rc1, which was what Dave had as the base of his tree when I started merging post -rc1 fixes into wireless.git. I'm sorry if this is inconvenient, but among other things this keeps net.git and linux.git stuff from getting into wireless-testing.git prematurely. 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
