lkml.org 
[lkml]   [2013]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the arm-soc tree with the xilinx tree
Hi all,

On Fri, 5 Apr 2013 15:33:35 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-spear/spear13xx.c between commit c79e33b3e828 ("ARM:
> smp_twd: convert to use CLKSRC_OF init") from the xilinx tree and commit
> 2b9c613c4ee1 ("ARM: spear: move generic.h and pl080.h into private dir")
> from the arm-soc tree.

BTW, that xilinx tree commit has no "Signed-off-by" for the committer ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-04-05 07:01    [W:0.157 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site