Merge "msm: thermal: Clean up msm cpufreq function calls" into msm-3.4