summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-19 11:28:36 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-19 11:28:36 -0800
commit89d3fa45b4add00cd0056361a2498e978cb1e119 (patch)
treeb717ab79c3258c3838d7d0753c5aeae61984e17c /drivers/block
parent477ea1169667a88d8ee12d83a0b0863091fb8670 (diff)
parent31908f45a583e8f21db37f402b6e8d5739945afd (diff)
downloadop-kernel-dev-89d3fa45b4add00cd0056361a2498e978cb1e119.zip
op-kernel-dev-89d3fa45b4add00cd0056361a2498e978cb1e119.tar.gz
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal managament updates from Zhang Rui: "Specifics: - Abstract the code and introduce helper functions for all int340x thermal drivers. From: Srinivas Pandruvada. - Reorganize the ACPI LPAT table support code so that it can be shared for both ACPI PMIC driver and int340x thermal driver. - Add support for Braswell in intel_soc_dts thermal driver. - a couple of small fixes/cleanups for step_wise governor and int340x thermal driver" * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: Thermal/int340x_thermal: remove unused uuids. thermal: step_wise: spelling fixes thermal: int340x: fix sparse warning Thermal/int340x: LPAT conversion for temperature ACPI / PMIC: Use common LPAT table handling functions ACPI / LPAT: Common table processing functions thermal: Intel SoC DTS: Add Braswell support Thermal/int340x/int3402: Provide notification support Thermal/int340x/processor_thermal: Add thermal zone support Thermal/int340x/int3403: Use int340x thermal API Thermal/int340x/int3402: Use int340x thermal API Thermal/int340x: Add common thermal zone handler
Diffstat (limited to 'drivers/block')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud