]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5a07fe8f1ae1fbbc27dfb7977fdfdc713a3ec1dd
treeb167a5233d24ba35330d97717c95d77019646805
parentc8ad7d6ff9414b4a39bd63140ee3ddcf489f2e0d
parenteca1b6248d7d661294a4396fcf80892e4a6e7541
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