author | Linus Torvalds <torvalds@linux-foundation.org> | |
Fri, 13 Apr 2018 23:52:26 +0000 (16:52 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Fri, 13 Apr 2018 23:52:26 +0000 (16:52 -0700) |
Pull thermal management update from Zhang Rui:
- Fix race condition in imx_thermal_probe() (Mikhail Lappo)
- Add cooling device's statistics in sysfs (Viresh Kumar)
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: Add cooling device's statistics in sysfs
thermal: imx: Fix race condition in imx_thermal_probe()
- Fix race condition in imx_thermal_probe() (Mikhail Lappo)
- Add cooling device's statistics in sysfs (Viresh Kumar)
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: Add cooling device's statistics in sysfs
thermal: imx: Fix race condition in imx_thermal_probe()
Trivial merge