From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Jan 2015 06:20:26 +0000 (+1300)
Subject: Merge branch 'thermal-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f800c25b7a762d445ba1439a2428c8362157eba6;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge branch 'thermal-soc' of git://git./linux/kernel/git/rzhang/linux

Pull thermal fixes from Zhang Rui:
 "Specifics:

   - bogus type qualifier fix in OF thermal code.
   - Minor fixes on imx and rcar thermal drivers.
   - Update TI SoC thermal maintainer entry.
   - Updated documentation of OF cpufreq cooling register"

* 'thermal-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  thermal: rcar: Spelling/grammar: s/drier use .../driver uses ...s/
  thermal: rcar: change type of ctemp in rcar_thermal_update_temp()
  thermal: rcar: fix ENR register value
  Documentation: thermal: document of_cpufreq_cooling_register()
  Thermal: imx: add clk disable/enable for suspend/resume
  MAINTAINERS: update ti-soc-thermal status
  MAINTAINERS: Add linux-omap to list of reviewers for TI Thermal
  thermal: of: Remove bogus type qualifier for of_thermal_get_trip_points()
---

f800c25b7a762d445ba1439a2428c8362157eba6