Re: [GIT PULL 5/7] ARM: SoC driver updates
From: Olof Johansson
Date: Tue Feb 17 2015 - 12:57:20 EST
On Tue, Feb 17, 2015 at 9:41 AM, Linus Torvalds
> On Tue, Feb 17, 2015 at 12:33 AM, Olof Johansson <olof@xxxxxxxxx> wrote:
>> 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
Whoops, sorry for that. I took merge conflict notes in a separate
window and copied and pasted, and did it into the wrong email.
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/