From: Shawn Guo <shawn.guo@linaro.org>
Date: Sun, 23 Nov 2014 06:55:14 +0000 (+0800)
Subject: Merge tag 'imx-fixes-3.18-2' into imx/soc
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~7595^2~6^2~14
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=035d0d7830b180215f0779d1b6dfb210f33a49fe;p=mirror_ubuntu-zesty-kernel.git

Merge tag 'imx-fixes-3.18-2' into imx/soc

The i.MX fixes for 3.18, 2nd round:
 - Fix a regression on Vybrid platform which is caused by commit
   dc4805c2e78b (ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3
   driver), and results in a missing configuration on PLL clocks.
 - Fix a regression with i.MX defconfig files where CONFIG_SPI option
   gets lost accidentally.
---

035d0d7830b180215f0779d1b6dfb210f33a49fe