diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2014-11-23 14:55:14 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2014-11-23 14:55:14 +0800 |
| commit | 035d0d7830b180215f0779d1b6dfb210f33a49fe (patch) | |
| tree | 02895e7f92ef037079d072a6465bc0b377174f85 /fs/ntfs/usnjrnl.h | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
| parent | 89fbec5b97fbcf08db3a9cd93a340f21f95d38b8 (diff) | |
| download | talos-obmc-linux-035d0d7830b180215f0779d1b6dfb210f33a49fe.tar.gz talos-obmc-linux-035d0d7830b180215f0779d1b6dfb210f33a49fe.zip | |
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.
Diffstat (limited to 'fs/ntfs/usnjrnl.h')
0 files changed, 0 insertions, 0 deletions
