Hi Grant,
Today's linux-next merge of the gpio tree got conflicts in
arch/arm/mach-imx/mm-imx1.c, arch/arm/mach-imx/mm-imx21.c and
arch/arm/mach-imx/mm-imx25.c between commit 8d3c41c8bc6a ("ARM: imx2: Fix
GPIO iosize") from the i.MX tree and commit e7fc6ae74467 ("gpio/mxc: get
rid of the uses of cpu_is_mx()") from the gpio tree.
The latter change incorporates the former, so I used the latter.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpRrYv9jFSEt.pgp
Description: PGP signature
