| commit | ba2b137d10bafc3cc514e52172b549e64a5402fb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 13 16:52:26 2018 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 13 16:52:26 2018 -0700 |
| tree | 1f57795b7555cc19e1453247e5e4bd27aa185a76 | |
| parent | 71893f116109c92e4cd230d990fad5bd7cb4f99d [diff] | |
| parent | b907b408ca64482989cd95dacef804ce509a3673 [diff] |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux 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()