Re: [GIT PULL 00/09] arm-soc: changes for 3.9

[Linus Torvalds]

On Thu, Feb 21, 2013 at 1:12 PM, Arnd Bergmann <arnd@xxxxxxxx> wrote:
>
> The merge conflicts I mention in the tags are all for conflicts
> between the arm-soc branches. There are a few more conflicts
> with other stuff you already pulled, but it all looks simple
> as well. I have uploaded a 'for-linus' branch to the arm-soc
> tree with the resolutions I used.

You also had some extra stuff in that branch, but apart from that, I
think our resolutions are identical except for trivial include file
ordering and whitespace.

But you should check, since I don't cross-compile the arm stuff..

              Linus
--
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/