diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-21 08:37:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-21 08:37:10 -0700 |
commit | 0a7e453103b9718d357688b83bb968ee108cc874 (patch) | |
tree | ac6a94998746b15475b8f9f2fcdb29e1cf62bf1e /fs/nfs | |
parent | cd82346934888e083da3b70e4bea13923175d086 (diff) | |
parent | 043e4652bf3378883e7c0db38fa47fa8e2558f9c (diff) | |
download | linux-3.10-0a7e453103b9718d357688b83bb968ee108cc874.tar.gz linux-3.10-0a7e453103b9718d357688b83bb968ee108cc874.tar.bz2 linux-3.10-0a7e453103b9718d357688b83bb968ee108cc874.zip |
Merge branch 'next' of git://git.kernel.org/pub/scm/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()
Diffstat (limited to 'fs/nfs')
0 files changed, 0 insertions, 0 deletions