Merge "defconfig: 8960: Enable pm8xxx_regulator driver" into msm-3.0