[lkml]   [2011]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the arm tree with Linus' tree
On Wed, Sep 21, 2011 at 2:33 AM, Stephen Rothwell <> 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.

Linus Walleij
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at
Please read the FAQ at

 \ /
  Last update: 2011-09-21 11:45    [W:0.043 / U:41.984 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site