On Wed, Apr 20, 2011 at 05:20:15PM -0300, Gustavo F. Padovan wrote: > Hi John, > > * Gustavo F. Padovan <padovan@xxxxxxxxxxxxxx> [2011-04-20 14:04:32 -0300]: > > > Hi John, > > > > Four small fixes for 2.6.39. An incorrect refcnt balance for hci connection by > > Ville Tervo, a warning fix in the command timer by Vinicius Gomes, an ERTM > > fix by Ruiyi Zhang, and SCO synchronization fix by Luiz Augusto von Dentz. > > > > Please pull or let me know any problems. Thanks. > > Hold on with the pull! I've found a merge conflict with -next. (I tested the > merge with --dry-run, but it doesn't check for check conflicts). I'll do the > right thing now and send a new pull request to you soon. > > Regards, > > -- > Gustavo F. Padovan > http://profusion.mobi FWIW, I already did the pull into wireless-2.6 and pushed it out for some soak time. If there is a merge conflict with -next, then please let me know how to fix it and I'll pull wireless-2.6 into wireless-next-2.6 as soon as possible to eliminate the conflict. 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
