diff options
author | Zhang Rui <rui.zhang@intel.com> | 2013-11-07 01:45:54 +0100 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2013-11-07 01:45:54 +0100 |
commit | 86e0a0bdf81c2dfa2a5a258dbb52f49c40ebc197 (patch) | |
tree | 925e9a61b32fb90f10cecb3e2726282b5c7bcc33 /drivers/acpi | |
parent | thermal/intel_powerclamp: Add newer CPU models (diff) | |
parent | tools/thermal: Introduce tmon, a tool for thermal subsystem (diff) | |
parent | thermal: Fix binding problem when there is thermal zone params (diff) | |
download | linux-86e0a0bdf81c2dfa2a5a258dbb52f49c40ebc197.tar.xz linux-86e0a0bdf81c2dfa2a5a258dbb52f49c40ebc197.zip |
Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next