Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal

Browse source

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

...

This commit is contained in:

Linus Torvalds 2015-04-12 10:43:30 -07:00

parent 56fd85b5dd 541d529f98

commit 54d8ccc302

5 changed files with 18 additions and 16 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

Documentation/devicetree/bindings/thermal/rcar-thermal.txt

View file

2

drivers/thermal/st/st_thermal.c

View file

10

drivers/thermal/st/st_thermal_memmap.c

View file

14

drivers/thermal/st/st_thermal_syscfg.c

View file

6

drivers/thermal/thermal_core.c

View file