diff options
| author |  Zhang Rui <rui.zhang@intel.com>
| 2015-09-02 10:08:02 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com>
| 2015-09-02 10:08:02 +0800 |
| commit | 5a924a07f882e866f2337bf65048be357956691a (patch) | |
| tree | 9044da89d0057e67ddd968fbf57f848e6b591bc9 /drivers/acpi | |
| parent | Linux 4.2 (diff) | |
| parent | thermal: Add comment explaining test for critical temperature (diff) | |
| parent | thermal: Add Intel PCH thermal driver (diff) | |
| download | linux-5a924a07f882e866f2337bf65048be357956691a.tar.gz linux-5a924a07f882e866f2337bf65048be357956691a.tar.bz2 linux-5a924a07f882e866f2337bf65048be357956691a.zip | |
Merge branches 'thermal-core' and 'thermal-intel' of .git into next