Merge branch 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
authorOlof Johansson <olof@lixom.net>
Thu, 7 Jun 2012 21:59:28 +0000 (14:59 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 7 Jun 2012 21:59:28 +0000 (14:59 -0700)
commit6f4b3bf5dc0edb5b08d96486f35f5cbc24b72c40
tree4277ede78d08047ab1ab92cda179da7e40a357a7
parent434978e678605c8370d3d71e88796c264f70a8bf
parent350ab15bb2ffe7103bc6bf6c634f3c5b286eaf2a
Merge branch 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

* 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM i.MX imx21ads: Fix overlapping static i/o mappings
  ARM i.MX27 Visstrim M10: fix gpio handling.
  ARM: imx: only call l2x0_init if it's available
  ARM: imx: only specify i2c device type once
  ARM: mx31_3ds: Fix build due to missing IMX_HAVE_PLATFORM_IMX_SSI
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/mach-cpuimx35.c
arch/arm/mach-imx/mach-cpuimx51sd.c
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
arch/arm/mach-imx/mach-mx21ads.c
arch/arm/mach-imx/mm-imx3.c