From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 May 2017 23:18:27 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux... 
X-Git-Tag: v4.12-rc3~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=d09bc680ca42ddf3e7b862b95c59af6ef4477840;p=linux.git

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

Pull thermal SoC management fixes from Eduardo Valentin:

 - fixes to TI SoC driver, Broadcom, qoriq

 - small sparse warning fix on thermal core

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  thermal: broadcom: ns-thermal: default on iProc SoCs
  ti-soc-thermal: Fix a typo in a comment line
  ti-soc-thermal: Delete error messages for failed memory allocations in ti_bandgap_build()
  ti-soc-thermal: Use devm_kcalloc() in ti_bandgap_build()
  thermal: core: make thermal_emergency_poweroff static
  thermal: qoriq: remove useless call for of_thermal_get_trip_points()
---

d09bc680ca42ddf3e7b862b95c59af6ef4477840