Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
authorOlof Johansson <olof@lixom.net>
Tue, 18 Sep 2012 17:16:44 +0000 (10:16 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 18 Sep 2012 17:16:44 +0000 (10:16 -0700)
commit213f18a98b1cb9fc29c107bf2fb12aae306508aa
tree51a13a1b1fa9b653a660ab25ac7c9a56a07c2de8
parent643536912ee6d215e7c4d09e8847b76f90005768
parent6a72f038d88e2ee7b535c6dc2852e67e2301ed97
Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes

From Sascha Hauer:

ARM i.MX: Two fixes for i.MX
- armadillo5x0 board broken since v3.5 (stable material)
- i.MX25 Architecture broken since v3.6-rc1

* tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM i.MX25: Make timer irq work again
  ARM: imx: armadillo5x0: Fix illegal register access