summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-07-07 13:23:13 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-07-07 13:23:13 -0700
commit448bfad8a185876ce8de484a921d49769972cad7 (patch)
tree2dd2648f31b2bf7c127734baae70df82ae5b1d0d /block
parent4c2f503aade27ebf12f5733a583d711f99dc5ec1 (diff)
parent4adccf9fc84aaf5e4d18442e163d549e0b603075 (diff)
downloadlinux-448bfad8a185876ce8de484a921d49769972cad7.tar.bz2
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal fixes from Zhang Rui: "Specifics: - update Email address of Thermal subsystem maintainer Eduardo Valentin. - fix a problem that unloading thermal module results in kernel crash because a non-exist device file is removed on thermal unload. - fix a problem that critical trip point is set wrongly on latest i.MX6 SOC and results in system critical shutdown. - a couple of fixes to Tmon tool, of-thermal code and ti thermal driver" * 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: tmon: set umask to a reasonable value tmon: Check log file for common secuirty issues tools/thermal: tmon: fix compilation errors when building statically thermal: ti-soc-thermal: ti-bandgap.c: Cleaning up wrong address is checked Thermal: imx: correct critical trip temperature setting thermal: Bind cooling devices with the correct arguments thermal: Add braces around suspect code thermal: hwmon: Make the check for critical temp valid consistent MAINTAINERS: Update Eduardo Valentin's email address
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions