msm-thermal control from crpalmer
.
Conflicts:
	drivers/thermal/msm_thermal.c