From: Olof Johansson <olof@lixom.net>
Date: Tue, 18 Sep 2012 17:16:44 +0000 (-0700)
Subject: Merge tag 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
X-Git-Tag: v3.6~14^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23f3f0613f6172ef1f0cbb0e971adf29f1c1fe5e;p=profile%2Fcommon%2Fkernel-common.git

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
---

23f3f0613f6172ef1f0cbb0e971adf29f1c1fe5e