commit | 26a806c064b7be25fc7c255b5d83646cf4645a93 | [log] [tgz] |
---|---|---|
author | Olof Johansson <olof@lixom.net> | Sun Sep 16 17:15:29 2012 -0700 |
committer | Olof Johansson <olof@lixom.net> | Sun Sep 16 17:15:29 2012 -0700 |
tree | 9fa30cb5b806f37ebf1a0c9f99d7b596a417a0b7 | |
parent | e5567598c61907187261aba7095ac825d8060827 [diff] | |
parent | 7852399cc666fda491e481575bdbf61bace58f00 [diff] |
Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc ARM i.MX SoC updates * tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6: ARM: i.MX35: Implement camera and keypad clocks ARM: mxc: ssi-fiq: Make ssi-fiq.S Thumb-2 compatible ARM i.MX53: register CAN clocks arm imx31: add a few pinmux settings the tt01 needs