Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Aug 2018 23:11:34 +0000 (16:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Aug 2018 23:11:34 +0000 (16:11 -0700)
commit3f16503b7d2274ac8cbab11163047ac0b4c66cfe
treeb7b54975adad707255034e1648fb6f0bc8f9ba40
parent050cdc6c9501abcd64720b8cc3e7941efee9547d
parent152395fd03d4ce1e535a75cdbf58105e50587611
Merge branch 'fixes' of git://git./linux/kernel/git/evalenti/linux-soc-thermal

Pull thermal fixes from Eduardo Valentin:
 "Minor fixes to OF thermal, qoriq, and rcar drivers"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  thermal: of-thermal: disable passive polling when thermal zone is disabled
  thermal: rcar_gen3_thermal: convert to SPDX identifiers
  thermal: rcar_thermal: convert to SPDX identifiers
  thermal: qoriq: Switch to SPDX identifier
  thermal: qoriq: Simplify the 'site' variable assignment
  thermal: qoriq: Use devm_thermal_zone_of_sensor_register()