Merge "qup_i2c: Move to new clock APIs" into msm-3.0