]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Aug 2015 02:54:27 +0000 (05:54 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 9 Aug 2015 02:54:27 +0000 (05:54 +0300)
commitee14e430a37a6299b090b10bc48a76b4b87db900
tree9ed2c15fb3eeb85079f0b6c9e563577ec4be3b97
parent2f9422fe68208607cdef6ab4e11658e9bf7c17f4
parent48debd2813977c8bc8528bf3bb60db8996072a28
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

Pull thermal management fixes from Zhang Rui:
 "Specifics:

   - fix an error that "weight_attr" sysfs attribute is not removed
     while unbinding.  From: Viresh Kumar.

   - fix power allocator governor tracing to return the real request.
     From Javi Merino.

   - remove redundant owner assignment of hisi platform thermal driver.
     From Krzysztof Kozlowski.

   - a couple of small fixes of Exynos thermal driver.  From Krzysztof
     Kozlowski and Chanwoo Choi"

* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  thermal: Drop owner assignment from platform_driver
  thermal: exynos: Remove unused code related to platform_data on probe()
  thermal: exynos: Add the dependency of CONFIG_THERMAL_OF instead of CONFIG_OF
  thermal: exynos: Disable the regulator on probe failure
  thermal: power_allocator: trace the real requested power
  thermal: remove dangling 'weight_attr' device file