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

[Stephen Rothwell]

Hi Sascha,

Today's linux-next merge of the i.MX tree got a conflict in
arch/arm/plat-mxc/devices/platform-pata_imx.c between commit 236c4e8be436
("ARM: imx: Add PATA resources for other i.MX processors") from the
arm-soc tree and commit 8354b5d2a1c5 ("ARM: imx: Add PATA resources for
other i.MX processors") from the i.MX tree.

The latter appears to be a corrected version of the former (despite
having the same Author date ...) so I used that.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature