summaryrefslogtreecommitdiff
path: root/fs/btrfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-09 05:54:27 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-09 05:54:27 +0300
commitbae1577e3df471f6752e4b15380d6c67e8e17e8f (patch)
tree9ed2c15fb3eeb85079f0b6c9e563577ec4be3b97 /fs/btrfs
parentdd2384a75d1c046faf068a6352732a204814b86d (diff)
parent8bf93f2476cede84e6d7e7de5da9a55aeb196f9e (diff)
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management fixes from Zhang Rui: "Specifics: - fix an error that "weight_attr" sysfs attribute is not removed while unbinding. From: Viresh Kumar. - fix power allocator governor tracing to return the real request. From Javi Merino. - remove redundant owner assignment of hisi platform thermal driver. From Krzysztof Kozlowski. - a couple of small fixes of Exynos thermal driver. From Krzysztof Kozlowski and Chanwoo Choi" * 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: thermal: Drop owner assignment from platform_driver thermal: exynos: Remove unused code related to platform_data on probe() thermal: exynos: Add the dependency of CONFIG_THERMAL_OF instead of CONFIG_OF thermal: exynos: Disable the regulator on probe failure thermal: power_allocator: trace the real requested power thermal: remove dangling 'weight_attr' device file
Diffstat (limited to 'fs/btrfs')
0 files changed, 0 insertions, 0 deletions