tree 873bff0c72d1edb9d24aae7733b471f1e6721208
parent ffda81b69fce50f2543be99ef2d7c77dffc1ebc1
parent 8c173d5e044d7e7fc9f6070c0fc1c79c0f8256a6
author Linus Torvalds <torvalds@linux-foundation.org> 1580510361 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1580510361 -0800
mergetag object 8c173d5e044d7e7fc9f6070c0fc1c79c0f8256a6
 type commit
 tag thermal-v5.6-rc1-2
 tagger Daniel Lezcano <daniel.lezcano@linaro.org> 1580467156 +0100
 
 - 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)
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRuKdf4M92Gi9vqihve5qtOL396pgUCXjQEIwAKCRDe5qtOL396
 prqTAP472tKKudhnEsEsQx0azxYmkW/wCS8fNnrgMkZOE81ibQEAgdmofHjjdSNl
 GsPRU5+5tMqQ6isNMYYc2glQpYlB9QA=
 =rxjU
 -----END PGP SIGNATURE-----

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