diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 06:42:31 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 06:42:31 +0100 |
| commit | 549608eadb31eac5d579ed70a21ac722bdf72861 (patch) | |
| tree | 0ecc4b03ed9feca47b7b5beb2f84d27f0c6f9d8d /drivers/lguest | |
| parent | Merge tag 'pci-v3.13-changes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next (diff) | |
| download | linux-549608eadb31eac5d579ed70a21ac722bdf72861.tar.xz linux-549608eadb31eac5d579ed70a21ac722bdf72861.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management updates from Zhang Rui:
"This time we only have a few changes as there are no soc thermal
changes from Eduardo. The only big change is the introduction of
TMON, a tool to help visualize, tune, and test the thermal subsystem.
The rest is mostly cleanups and fixes all over.
Specifics:
- introduce TMON, a tool base on thermal sysfs I/F. It can be used
to visualize, tune and test the thermal subsystem.
- fix a zone/cooling device binding problem, when both thermal zone
bind parameters and .bind() callback are available"
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
tools/thermal: Introduce tmon, a tool for thermal subsystem
thermal: Fix binding problem when there is thermal zone params
thermal: cpu_cooling: fix return value check in cpufreq_cooling_register()
Thermal: Check for validity before doing kfree
thermal/intel_powerclamp: Add newer CPU models
Thermal: Tidy up error handling in powerclamp_init
thermal: Kconfig: cosmetic fixes
ACPI/thermal : Remove zone disabled warning
typo in drivers/thermal/Kconfig: lpatform instead of platform
Diffstat (limited to 'drivers/lguest')
0 files changed, 0 insertions, 0 deletions