diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-13 16:52:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-13 16:52:26 -0700 |
| commit | ba2b137d10bafc3cc514e52172b549e64a5402fb (patch) | |
| tree | 1f57795b7555cc19e1453247e5e4bd27aa185a76 /Documentation/filesystems/debugfs.txt | |
| parent | 71893f116109c92e4cd230d990fad5bd7cb4f99d (diff) | |
| parent | b907b408ca64482989cd95dacef804ce509a3673 (diff) | |
| download | blackbird-obmc-linux-ba2b137d10bafc3cc514e52172b549e64a5402fb.tar.gz blackbird-obmc-linux-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 'Documentation/filesystems/debugfs.txt')
0 files changed, 0 insertions, 0 deletions
