Merge tag 'imx-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6 into...
authorOlof Johansson <olof@lixom.net>
Tue, 8 Jan 2013 16:39:00 +0000 (08:39 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 8 Jan 2013 16:39:00 +0000 (08:39 -0800)
commit2d9e02cad61c49798d9d36b9d87739c279fd6b0f
treecd3411d435b6163a65963c427b5ec7d4f794908c
parent5cf87a12cac05460666faa22711b655a327b2219
parente37f0d5b32c2a66677d0f2a21431a87e7e9ce22d
Merge tag 'imx-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes

From Shawn Guo:

It includes one critical fix - wrong flexcan2 clock will hang system
when the port gets brought up.  The other two are non-critical fixes,
which are sent together here, since it's still early -rc stage.

* tag 'imx-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mx5: Fix MX53 flexcan2 clock
  ARM: dts: imx31-bug: Fix manufacturer compatible string
  clk: imx: Remove 'clock-output-names' from the examples