Hi all, On Fri, 5 Apr 2013 15:33:35 +1100 Stephen Rothwell <[email protected]> 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 [email protected]
pgpM98677pozH.pgp
Description: PGP signature
