Messages in this thread | | | Date | Fri, 5 Apr 2013 15:33:35 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the xilinx tree |
| |
Hi all,
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.
I fixed it up (just used the arm-soc tree version) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |