From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 31 Jan 2020 22:39:21 +0000 (-0800)
Subject: Merge tag 'thermal-v5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/therm... 
X-Git-Tag: v5.6-rc1~95
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=68b62e5d965a8cbcfa287ee7754cf06e9b3775ab;p=linux-block.git

Merge tag 'thermal-v5.6-rc1-2' of git://git./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
---

68b62e5d965a8cbcfa287ee7754cf06e9b3775ab