]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
commit23f3f0613f6172ef1f0cbb0e971adf29f1c1fe5e
tree51a13a1b1fa9b653a660ab25ac7c9a56a07c2de8
parent652f5b5e8019d33deef29b198cbcc0f982a8a316
parent42a3f891caee0d9baa60a6964e41a28b9c657407
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