Merge "mmc: sdhci: pull in missing changes during msm3.4 kernel upgrade"