On Tue, Nov 10, 2015 at 1:30 AM, Olof Johansson <o...@lixom.net> wrote: > On Mon, Sep 21, 2015 at 11:24 AM, Linus Walleij > <linus.wall...@linaro.org> wrote: >> On Wed, Sep 16, 2015 at 8:37 AM, Ludovic Desroches >> <ludovic.desroc...@atmel.com> wrote: >> >>> Add pio4 controller node to enable pinmux and gpio. >>> >>> Signed-off-by: Ludovic Desroches <ludovic.desroc...@atmel.com> >> >> Patch applied. > > Please don't merge DT changes through driver trees unless there's a > very specific reason to do so, since it introduces random conflicts.
Sorry :( Even noted this in the pull request to Torvalds, it was in the bottom of my patch stack so had been in -next for ages, I was afraid it would create more problem than it solves if I reverted the patch, but I guess I should have done so anyways. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
