Merge changes Id7f0e657,Iab5a15e0 into msm-3.4

* changes:
  msm: board-8960: Initialize msm_thermal() during board init
  msm: thermal: Simplify kernel thermal safeguard mechanism