Merge "msm: 8960: Configure SDIO on SDC2 slot" into msm-3.0