On 28/05/2017 15:59, Linus Walleij wrote: > On Tue, May 16, 2017 at 9:58 AM, Andrew Jeffery <andrew@xxxxxxxx> wrote: > >> Also clean up space-before-tab issues in the documentation. >> >> Signed-off-by: Andrew Jeffery <andrew@xxxxxxxx> > > Reviewed-by: Linus Walleij <linus.walleij@xxxxxxxxxx> > > Does this collide with Daniel's 2500 patch? > > Sorry for the mess, tell me if I need to fix something up :( It is ok, an usual collision change to be fixed when merging ;) By the way, can you have a look at fttmr010_read_sched_clock to remove the local_fttmr->count_down test? Thanks. -- Daniel -- <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html