Merge "defconfig: msm8960: Enable diag bridge host driver over HSIC" into msm-3.0