From: Olof Johansson <olof@lixom.net>
Date: Fri, 27 Jan 2012 07:15:11 +0000 (-0800)
Subject: Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
X-Git-Tag: submit/tizen_common/20140905.094502~6040^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5e9638643132795e6168bb483e883b6a9678e7b5;p=sdk%2Femulator%2Femulator-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:
  arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap
  ARM: imx: iomux-v1.h: Fix build error due to __init annotation
---

5e9638643132795e6168bb483e883b6a9678e7b5