Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 May 2017 23:18:27 +0000 (16:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 May 2017 23:18:27 +0000 (16:18 -0700)
commitd09bc680ca42ddf3e7b862b95c59af6ef4477840
tree3adaff4f2958c97a91533902487506b462d8f416
parent249f1efd8e3d58f86469fc305b0eda39db18d7ce
parenta54c51863ed1294078a435151e625313b4365ac5
Merge branch 'fixes' of git://git./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()