Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Apr 2018 17:56:32 +0000 (10:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Apr 2018 17:56:32 +0000 (10:56 -0700)
commit83beed7b2b26f232d782127792dd0cd4362fdc41
tree74acc56b826d5bbfc2b8955ce734481328e65a79
parent7e3cb169d3a9ef840db1b73609ebb9e7d20a2f1a
parente04907dbc25930b88ee2328fe692c776f63ddf2c
Merge branch 'fixes' of git://git./linux/kernel/git/evalenti/linux-soc-thermal

Pull thermal fixes from Eduardo Valentin:
 "A couple of fixes for the thermal subsystem"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  dt-bindings: thermal: Remove "cooling-{min|max}-level" properties
  dt-bindings: thermal: remove no longer needed samsung thermal properties