On Tue, Feb 17, 2015 at 12:33 AM, Olof Johansson <o...@lixom.net> wrote:
>
> Conflicts:
>
> arch/arm/boot/dts/rk3288.dtsi: add/add: Keep both sides
...
You mixed up the aliases of this pull and the previous DT pull.
Not a real problem, but while resolving the DT aliases (which you
claimed had "No conflicts") I was wondering just what you had been
doing..
Linus
--
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/
