diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-13 23:02:41 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-13 23:02:41 +0300 |
| commit | 76a5cfb8e7c98ae0ea238910f97c17cb1f638918 (patch) | |
| tree | de3166d110637dee7d49d5cb22ea31d80756b3f2 /block/blk-merge.c | |
| parent | e10db791bf73c1973f24591897e839db2eb3c804 (diff) | |
| parent | 99c47fcd4daa2b9a1348872ba49226dcdc58cb40 (diff) | |
| download | linux-76a5cfb8e7c98ae0ea238910f97c17cb1f638918.tar.xz | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal
Pull thermal fixes from Eduardo Valentin:
"Fixes for STM and HISI thermal drivers"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
thermal: stm32: Fix stm_thermal_read_factory_settings
thermal: stm32: read factory settings inside stm_thermal_prepare
thermal/drivers/hisi: Fix number of sensors on hi3660
thermal/drivers/hisi: Fix wrong platform_get_irq_byname()
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions