Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Jan 2015 18:53:51 +0000 (07:53 +1300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Jan 2015 18:53:51 +0000 (07:53 +1300)
commit4f7a42deff8b406d091c989f2587d97889adfd60
tree6a1ad9beef6afb96d363b5cf5462e841b48bb3cc
parent971780b701946be0d6e34b4abf6eec1ab05ec0c8
parentad0f409051a67dde8d454990e09b6db41f675876
Merge branch 'for-rc' of git://git./linux/kernel/git/rzhang/linux

Pull thermal management fixes from Zhang Rui:
 "Specifics:

   - Fix a problem that Intel SoC DTS thermal driver does not work when
     CONFIG_THERMAL_INT340X is not set.

   - Fix a NULL pointer dereference when processor_thermal_device driver
     is loaded on a platform without ACPI support"

* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  int340x_thermal/processor_thermal_device: return failure when
  ACPI/int340x_thermal: enumerate INT3401 for Intel SoC DTS thermal driver
  ACPI/int340x_thermal: enumerate INT340X devices even if they're not in _ART/_TRT