[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CA+55aFwjvH=rGb6Qif5Ty17EmVXiLoeUSMTWy8LzOphQUrd6Sg@mail.gmail.com>
Date: Thu, 21 Feb 2013 16:47:41 -0800
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Arnd Bergmann <arnd@...db.de>
Cc: ARM SoC <arm@...nel.org>, linux-arm-kernel@...ts.infradead.org,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL 00/09] arm-soc: changes for 3.9
On Thu, Feb 21, 2013 at 1:12 PM, Arnd Bergmann <arnd@...db.de> 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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists