Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Apr 2015 17:43:30 +0000 (10:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Apr 2015 17:43:30 +0000 (10:43 -0700)
commit54d8ccc30270586f869bfb46ff8a8ca330c8aa23
treee8af941e1817e12a1a3dc96161350bd196cdef3a
parent56fd85b5dd595c84ed12b4b12e9b271876ac34de
parent541d529f9845d249d1cb84f1b395e48f0a117e3f
Merge branch 'fixes' of git://git./linux/kernel/git/evalenti/linux-soc-thermal

Pull last minute thermal-SoC management fixes from Eduardo Valentin:
 "Specifics:

   - Minor fixes on ST and RCAR thermal drivers.
   - Avoid flooding kernel log when driver returns -EAGAIN.

  Note: I am sending this pull on Rui's behalf while he fixes issues in
  his Linux box"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  drivers: thermal: st: remove several sparse warnings
  thermal: constify of_device_id array
  thermal: Do not log an error if thermal_zone_get_temp returns -EAGAIN
  thermal: rcar: Fix typo in r8a73a4 SoC name