projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0df1f24 89fbec5)
Merge tag 'imx-fixes-3.18-2' into imx/soc
authorShawn Guo <shawn.guo@linaro.org>
Sun, 23 Nov 2014 06:55:14 +0000 (14:55 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Sun, 23 Nov 2014 06:55:14 +0000 (14:55 +0800)
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.


Trivial merge
Domain: System / Kernel;