From: Shawn Guo <shawn.guo@linaro.org>
Date: Fri, 12 Apr 2013 10:59:30 +0000 (+0800)
Subject: Merge tag 'imx-fixes-3.9-5' into imx/soc
X-Git-Tag: next-20130422~13^2~5^2~29
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7c3c1b8c90e0f226610b9932cd66678d99e42176;p=karo-tx-linux.git

Merge tag 'imx-fixes-3.9-5' into imx/soc

The imx fixes for 3.9, take 5:

* A couple imx35 clock fixes for regressions caused by common clock
  framework conversion.  The admux and iomux get disabled by common
  clock framework late initcall, and hence causes problems.
* Add missing twd clock lookup in device tree.  This becomes required
  since commit bd60345 (ARM: use device tree to get smp_twd clock)
  forces all DT boot to find lookup from device tree.
* Fix imx6q ldb_di clock parents mismatch per reference manual.
---

7c3c1b8c90e0f226610b9932cd66678d99e42176