Re: [GIT PULL 3/7] ARM SoC specific changes

[Olof Johansson]

On Tue, Jul 2, 2013 at 4:51 PM, Linus Torvalds
<torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
> On Tue, Jul 2, 2013 at 4:17 PM, Russell King - ARM Linux
> <linux@xxxxxxxxxxxxxxxx> wrote:
>> Please don't merge this yet.
>
> Oops, too late. The ARM SoC pull requests got merged a couple of hours ago..

It should hopefully not be a big problem, you'll see a merge conflict
(so will sfr) when merging from Russell due to add/add conflicts been
resolved by ordering them in opposite order in
arch/arm/include/asm/glue-proc.h.

Feel free to flip them back to Russell's preferred ordering at that
time, of course.


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