tree b167a5233d24ba35330d97717c95d77019646805
parent d8c4cd7463ab4b09aa0b1bd79f36c3ebacd2cc77
parent 945f82f25f9c49b93c315e0acc6d965cb37e137f
author Olof Johansson <olof@lixom.net> 1327648511 -0800
committer Olof Johansson <olof@lixom.net> 1327648511 -0800

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