linux-next: manual merge of the arm-soc tree with the arm tree

Stephen Rothwell sfr at
Thu May 3 01:35:10 EDT 2012

Hi all,

Today's linux-next merge of the arm-soc tree got conflicts in
arch/arm/mach-ixp2000 and arch/arm/mach-ixp23xx between commits from the
arm tree and commits from the arm-soc tree.

On Russell's advise, I just removed those two directories completely.
Stephen Rothwell                    sfr at
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <>

More information about the linux-arm-kernel mailing list