Messages in this thread | | | Date | Thu, 24 Nov 2011 11:52:39 +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/tools/mach-types between commit bb9b25f923fc ("ARM: Update mach-types") from the arm tree and commit 9b7c547f7747 ("ARM: Update mach-types to fix mxs build breakage") from the arm-soc tree.
The arm tree version is a superset of the arm-soc version, so I used that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |