Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Mar 2013 15:37:10 +0000 (08:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Mar 2013 15:37:10 +0000 (08:37 -0700)
commit0a7e453103b9718d357688b83bb968ee108cc874
treeac6a94998746b15475b8f9f2fcdb29e1cf62bf1e
parentcd82346934888e083da3b70e4bea13923175d086
parent043e4652bf3378883e7c0db38fa47fa8e2558f9c
Merge branch 'next' of git://git./linux/kernel/git/rzhang/linux

Pull thermal management fixes from Zhang Rui.

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  thermal: exynos_thermal: return a proper error code while thermal_zone_device_register fail.
  thermal: rcar_thermal: propagate return value of thermal_zone_device_register
  Thermal: kirkwood: Convert to devm_ioremap_resource()
  Thermal: rcar: Convert to devm_ioremap_resource()
  Thermal: dove: Convert to devm_ioremap_resource()
  thermal: rcar: fix missing unlock on error in rcar_thermal_update_temp()