diff options
| author | Linus Torvalds <[email protected]> | 2018-04-13 23:52:26 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2018-04-13 23:52:26 +0000 |
| commit | ba2b137d10bafc3cc514e52172b549e64a5402fb (patch) | |
| tree | 1f57795b7555cc19e1453247e5e4bd27aa185a76 /tools/perf/ui/browsers/annotate.c | |
| parent | Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | Merge branches 'thermal-core' and 'thermal-soc' into next (diff) | |
| download | kernel-ba2b137d10bafc3cc514e52172b549e64a5402fb.tar.gz kernel-ba2b137d10bafc3cc514e52172b549e64a5402fb.zip | |
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()
Diffstat (limited to 'tools/perf/ui/browsers/annotate.c')
0 files changed, 0 insertions, 0 deletions