From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Mar 2013 15:37:10 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
X-Git-Tag: v3.9-rc4~17
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=0a7e453103b9718d357688b83bb968ee108cc874;p=cascardo%2Flinux.git

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()
---

0a7e453103b9718d357688b83bb968ee108cc874