Messages in this thread | | | Date | Tue, 25 Oct 2011 07:45:32 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm-soc tree with the arm tree |
| |
Hi Arnd,
Today's linux-next merge of the arm-soc tree got a conflict in arch/arm/mach-exynos4/include/mach/entry-macro.S between commit 292b293ceef2 ("ARM: gic: consolidate PPI handling") from the arm tree and commit 3a0622811292 ("ARM: EXYNOS4: Add support MCT PPI for EXYNOS4212") from the arm-soc tree.
Again, I hacked it up (again probably incorrectly - I kept both additions). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |