Messages in this thread | | | Date | Wed, 28 Dec 2011 10:33:49 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the s5p tree with the arm tree |
| |
Hi Kukjin,
Today's linux-next merge of the s5p tree got a conflict in arch/arm/mach-s5p64x0/cpu.c between commit 95af214becab ("ARM: 7246/1: S5P64X0: introduce arch/arm/mach-s5p64x0/common.[ch]") from the arm tree and commit ebc433c2890f ("ARM: S5P64X0: Add HSMMC setup for host Controller") from the s5p tree.
I just removed the file, but the s5p tree patch may need applying to arch/arm/mach-s5p64x0/common.c.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |