Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 1 May 2016 01:57:42 +0000 (18:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 1 May 2016 01:57:42 +0000 (18:57 -0700)
commitda9373d67c8a7adf7d820f24fe672c5540f231ac
treeb13743e0be62a9604d2521fc5b05e3705a9f8727
parent1b46bac6275506db73592aa8b9bd1d67c79b95dc
parent15333e3af1de37b1b214b28c85fe9a7b257fb92c
Merge branch 'fixes' of git://git./linux/kernel/git/evalenti/linux-soc-thermal

Pull thermal fixes from Eduardo Valentin:
 "A couple of minor fixes for the thermal subsystem.

  Specifics in this pull request:

   - Fixes in hisilicon thermal driver
   - More fixes of unsigned to int type change in thermal_core.c"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  thermal: use %d to print S32 parameters
  thermal: hisilicon: increase temperature resolution