Re: [GIT PULL 5/7] ARM: SoC driver updates

From: Linus Torvalds
Date: Tue Feb 17 2015 - 12:41:15 EST

On Tue, Feb 17, 2015 at 12:33 AM, Olof Johansson <olof@xxxxxxxxx> 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

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at