tree 1272c913bb574fb22c763811e6616c8dd6e33156
parent 4dfa5739d9e135fa3731f3acfbc618e384c351d2
parent a6f4850dbca66e46a73b8774e85aaf9fc0caf265
author Linus Torvalds <torvalds@linux-foundation.org> 1461456939 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1461456939 -0700

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal

Pull thermal fixes from Eduardo Valentin:
 "Specifics in this pull request:

   - Fixes in mediatek and OF thermal drivers

   - Fixes in power_allocator governor

   - More fixes of unsigned to int type change in thermal_core.c.

  These change have been CI tested using KernelCI bot. \o/"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  thermal: fix Mediatek thermal controller build
  thermal: consistently use int for trip temp
  thermal: fix mtk_thermal build dependency
  thermal: minor mtk_thermal.c cleanups
  thermal: power_allocator: req_range multiplication should be a 64 bit type
  thermal: of: add __init attribute