linux-next: manual merge of the i.MX tree with the tree
From: Stephen Rothwell
Date: Sun May 22 2011 - 21:45:52 EST
Today's linux-next merge of the i.MX tree got a conflict in
arch/arm/mach-imx/Kconfig arch/arm/plat-mxc/Kconfig between the "same"
commits from the arm tree and the i.MX tree.
Please don't rearrange commits when upstreaming them - or if you do, then
update the source tree as well. I am assuming that the commits that are
in the arm tree amount to the same as what has been int the i.MX tree for
some time. There are a couple of extra commits in the i.MX tree, so I
just used the i.MX version of those files. This may not work.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature