From: Olof Johansson <olof@lixom.net>
Date: Thu, 7 Jun 2012 21:59:28 +0000 (-0700)
Subject: Merge branch 'imx/fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
X-Git-Tag: v3.5-rc4~35^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f4b3bf5dc0edb5b08d96486f35f5cbc24b72c40;p=pandora-kernel.git

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
---

6f4b3bf5dc0edb5b08d96486f35f5cbc24b72c40
Reading git-diff-tree failed