summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2014-12-13 05:25:19 +0100
committerZhang Rui <rui.zhang@intel.com>2014-12-13 05:25:19 +0100
commit2707dbd09a859b7205917f9baf9d0192944ac46c (patch)
tree867352adee19affe11530c953dea3d89b27cad2a /drivers/hwmon
parentthermal: provide an UAPI header file (diff)
parentMerge branch 'eduardo-soc-thermal' into thermal-soc (diff)
parentThermal/int340x: Clear the error value of the last acpi_bus_get_device() call (diff)
downloadlinux-2707dbd09a859b7205917f9baf9d0192944ac46c.tar.xz
linux-2707dbd09a859b7205917f9baf9d0192944ac46c.zip
Merge branches 'thermal-core-fix', 'thermal-soc' and 'thermal-int340x' into next