Messages in this thread | | | Date | Tue, 25 Oct 2011 07:20:13 +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/plat-mxc/include/mach/memory.h between commit c039bad00f21 ("ARM: plat-mxc: remove mach/memory.h") from the arm tree and commits ae4fa7f66e54 ("ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCs") and 7409cd1cd554 ("ARM i.MX: allow to compile together all i.MX5 based SoCs") from the arm-soc tree.
The former removed the file, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |