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

[Olof Johansson]

On Tue, Feb 17, 2015 at 9:41 AM, Linus Torvalds
<torvalds at linux-foundation.org> wrote:
> On Tue, Feb 17, 2015 at 12:33 AM, Olof Johansson <olof at 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..

Whoops, sorry for that. I took merge conflict notes in a separate
window and copied and pasted, and did it into the wrong email.


-Olof