git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 434978e 350ab15)
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)
* '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


Trivial merge
Pandora Kernel Repository