Re: linux-next: manual merge of the arm tree with Linus' tree

[Linus Walleij]

On Wed, Sep 21, 2011 at 2:33 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:

> Today's linux-next merge of the arm tree got a conflict in
> arch/arm/mach-integrator/integrator_ap.c between commit b71d8429ec36
> ("mach-integrator: fix VGA base regression") from Linus' tree and commit
> b79573586838 ("ARM: 7087/2: mach-integrator: get timer frequency from
> clock") from the arm tree.
>
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

The fix is correct, thanks Stephen.

Yours,
Linus Walleij
--
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/