From: Olof Johansson <olof@lixom.net>
Date: Tue, 8 Jan 2013 16:39:00 +0000 (-0800)
Subject: Merge tag 'imx-fixes-3.8' of git://git.linaro.org/people/shawnguo/linux-2.6 into... 
X-Git-Tag: upstream/snapshot3+hdmi~5820^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d9e02cad61c49798d9d36b9d87739c279fd6b0f;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

2d9e02cad61c49798d9d36b9d87739c279fd6b0f