diff options
| author | Linus Torvalds | 2019-05-24 10:04:17 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2019-05-24 10:04:17 -0700 |
| commit | 49bbd8bb34a48267afb116c3dcfe0cb30b6638cb (patch) | |
| tree | c02047a509b3c27efda59deafcf62997bdba2d5e /drivers/ata | |
| parent | e50e6798f1e29e57bc83ba546a9bbbdabe1104a4 (diff) | |
| parent | 6a310f8f97bb8bc2e2bb9db6f49a1b8678c8d144 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/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"
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions