diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2017-07-05 15:01:06 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2017-07-05 15:01:06 +0800 |
| commit | 5d72ed35678a351a1aed4b454c25d583f8bccb28 (patch) | |
| tree | a0c034bb295e3e78304533d4dffb0a2d5022c974 /tools/perf/scripts/python | |
| parent | thermal: fix source code documentation for parameters (diff) | |
| parent | thermal: int340x: check for sensor when PTYP is missing (diff) | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalent... (diff) | |
| download | linux-5d72ed35678a351a1aed4b454c25d583f8bccb28.tar.gz linux-5d72ed35678a351a1aed4b454c25d583f8bccb28.zip | |
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next