linux-next: manual merge of the arm-soc tree with the arm tree
From: Stephen Rothwell <hidden>
Date: 2011-11-24 00:53:02
Also in:
lkml
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/ Attachments
- (unnamed) [application/pgp-signature] 836 bytes