diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-24 20:14:26 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-24 20:14:26 -0700 | 
| commit | ced255c0c5fb9ab52c9465982f23b1c14005ef8b (patch) | |
| tree | dfe7c308312ca57a612fc687a31d3a6a6e6ea3f0 /lib/dynamic_debug.c | |
| parent | 4401555a98601a3de7cc876ceeac1d5d09f617e6 (diff) | |
| parent | 97584d1838b7e2545c3b10aacef3327fcaa9531b (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management fixes from Zhang Rui:
 - Power allocator governor changes to allow binding on thermal zones
   with missing power estimates information.  From Javi Merino.
 - Add compile test flags on thermal drivers that allow it without
   producing compilation errors.  From Eduardo Valentin.
 - Fixes around memory allocation on cpu_cooling.  From Javi Merino.
 - Fix on db8500 cpufreq code to allow autoload.  From Luis de
   Bethencourt.
 - Maintainer entries for cpu cooling device
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  thermal: power_allocator: exit early if there are no cooling devices
  thermal: power_allocator: don't require tzp to be present for the thermal zone
  thermal: power_allocator: relax the requirement of two passive trip points
  thermal: power_allocator: relax the requirement of a sustainable_power in tzp
  thermal: Add a function to get the minimum power
  thermal: cpu_cooling: free power table on error or when unregistering
  thermal: cpu_cooling: don't call kcalloc() under rcu_read_lock
  thermal: db8500_cpufreq_cooling: Fix module autoload for OF platform driver
  thermal: cpu_cooling: Add MAINTAINERS entry
  thermal: ti-soc: Kconfig fix to avoid menu showing wrongly
  thermal: ti-soc: allow compile test
  thermal: qcom_spmi: allow compile test
  thermal: exynos: allow compile test
  thermal: armada: allow compile test
  thermal: dove: allow compile test
  thermal: kirkwood: allow compile test
  thermal: rockchip: allow compile test
  thermal: spear: allow compile test
  thermal: hisi: allow compile test
  thermal: Fix thermal_zone_of_sensor_register to match documentation
Diffstat (limited to 'lib/dynamic_debug.c')
0 files changed, 0 insertions, 0 deletions
