Merge "defconfig: msm8960: enable HSIC host support" into msm-3.0