Merge "defconfig: msm8960: enable S5K3L1YX config" into msm-3.0