diff options
author | Linus Torvalds | 2019-05-24 19:04:17 +0200 |
---|---|---|
committer | Linus Torvalds | 2019-05-24 19:04:17 +0200 |
commit | 49bbd8bb34a48267afb116c3dcfe0cb30b6638cb (patch) | |
tree | c02047a509b3c27efda59deafcf62997bdba2d5e /arch/arm64/include/asm/kvm_coproc.h | |
parent | Merge tag 'mmc-v5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc (diff) | |
parent | thermal: rcar_gen3_thermal: Update temperature conversion method (diff) | |
download | kernel-qcow2-linux-49bbd8bb34a48267afb116c3dcfe0cb30b6638cb.tar.gz kernel-qcow2-linux-49bbd8bb34a48267afb116c3dcfe0cb30b6638cb.tar.xz kernel-qcow2-linux-49bbd8bb34a48267afb116c3dcfe0cb30b6638cb.zip |
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 'arch/arm64/include/asm/kvm_coproc.h')
0 files changed, 0 insertions, 0 deletions