Merge branch 'for-rc' of git://

Pull thermal management fixes from Zhang Rui:

 - fix an ordering issue in cpu cooling that cooling device is
   registered before it's ready (freq_table being populated).
   (Lukasz Luba)

 - fix a missing comment update (Caesar Wang)

* 'for-rc' of git://
  thermal: add the note for set_trip_temp
  thermal: cpu_cooling: fix improper order during initialization