Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
authorOlof Johansson <olof@lixom.net>
Fri, 27 Jan 2012 07:15:11 +0000 (23:15 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 27 Jan 2012 07:15:11 +0000 (23:15 -0800)
commit5e9638643132795e6168bb483e883b6a9678e7b5
treeb167a5233d24ba35330d97717c95d77019646805
parentd8c4cd7463ab4b09aa0b1bd79f36c3ebacd2cc77
parent945f82f25f9c49b93c315e0acc6d965cb37e137f
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