On 29 August 2014 07:46, Kalle Valo <kvalo@xxxxxxxxxxxxxxxx> wrote: > Michal Kazior <michal.kazior@xxxxxxxxx> writes: > >> This makes it easier to log and debug via tracing >> with more than 1 ath10k device on a system. >> >> Signed-off-by: Michal Kazior <michal.kazior@xxxxxxxxx> > > In ath-next-test I had a simple conflict in wmi.c. Please check my > conflict resolution: > > https://github.com/kvalo/ath/commit/d4bcfa9487e0837fdaf01645ade15acbadc3873c Looks good, thanks. Michał -- 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
