commit 68b62e5d965a8cbcfa287ee7754cf06e9b3775ab
author Linus Torvalds <torvalds@linux-foundation.org> Fri Jan 31 14:39:21 2020 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Jan 31 14:39:21 2020 -0800
tree 873bff0c72d1edb9d24aae7733b471f1e6721208
parent ffda81b69fce50f2543be99ef2d7c77dffc1ebc1
parent 8c173d5e044d7e7fc9f6070c0fc1c79c0f8256a6

Merge tag 'thermal-v5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux

Pull thermal fixes from Daniel Lezcano:

 - Fix a severe docs build failure for cpu idle cooling device (Randy
   Dunlap)

 - Fix a spelling mistake in the error message for the stm32 (Colin Ian
   King)

* tag 'thermal-v5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal: stm32: fix spelling mistake "preprare" -> "prepare"
  Documentation: cpu-idle-cooling: fix a SEVERE docs build failure