From: Olof Johansson <olof@lixom.net>
Date: Mon, 17 Sep 2012 00:15:29 +0000 (-0700)
Subject: Merge tag 'imx-soc' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc
X-Git-Tag: firefly_0821_release~3680^2~1964^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=26a806c064b7be25fc7c255b5d83646cf4645a93;p=firefly-linux-kernel-4.4.55.git

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

26a806c064b7be25fc7c255b5d83646cf4645a93