From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 May 2019 17:04:17 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux... 
X-Git-Tag: v5.4-rc1~908
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49bbd8bb34a48267afb116c3dcfe0cb30b6638cb;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'fixes' of git://git./linux/kernel/git/evalenti/linux-soc-thermal

Pull thermal SoC fixes from Eduardo Valentin:

 - revert pinctrl settings on rockchip which causes boot failure on
   rk3288. The proper follow-up patch is being discussed, meanwhile
   the revert gets those booting again.

 - minor fixes on rcar and tegra

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  thermal: rcar_gen3_thermal: Update temperature conversion method
  thermal: rcar_gen3_thermal: Update calculation formula of IRQTEMP
  thermal: rcar_gen3_thermal: Update value of Tj_1
  thermal: tegra: Make tegra210_tsensor_thermtrips static
  Revert "thermal: rockchip: fix up the tsadc pinctrl setting error"
---

49bbd8bb34a48267afb116c3dcfe0cb30b6638cb