Merge "mmc: msm_sdcc: clean up sysfs attributes" into msm-3.0