| commit | 23f3f0613f6172ef1f0cbb0e971adf29f1c1fe5e | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Sep 18 10:16:44 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Tue Sep 18 10:16:44 2012 -0700 |
| tree | 51a13a1b1fa9b653a660ab25ac7c9a56a07c2de8 | |
| parent | 652f5b5e8019d33deef29b198cbcc0f982a8a316 [diff] | |
| parent | 42a3f891caee0d9baa60a6964e41a28b9c657407 [diff] |
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