lkml.org 
[lkml]   [2010]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the arm tree with Linus' tree
Hi Russell,

Today's linux-next merge of the arm tree got a conflict in
arch/arm/mach-mx25/clock.c between commit
ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9 ("Merge branch 'for-linus' of
master.kernel.org:/home/rmk/linux-2.6-arm") from Linus' tree (this looks
like the same merge ed1e01c8cf4772aabe013716353a7a0f879dbf5e ("Merge
branch 'master' into versatile") that is in the arm tree) and commit
04a03e5fe3d337242e5c0a9c93d2fd24cff545ef ("mx25: add platform support for
imxfb") from the arm tree.

I fixed it up (using the arm tree version) an can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2010-03-04 00:37    [W:0.023 / U:2.636 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site