diff options
author | Zhang Rui <rui.zhang@intel.com> | 2014-12-13 05:25:19 +0100 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2014-12-13 05:25:19 +0100 |
commit | 2707dbd09a859b7205917f9baf9d0192944ac46c (patch) | |
tree | 867352adee19affe11530c953dea3d89b27cad2a /drivers/hwmon | |
parent | thermal: provide an UAPI header file (diff) | |
parent | Merge branch 'eduardo-soc-thermal' into thermal-soc (diff) | |
parent | Thermal/int340x: Clear the error value of the last acpi_bus_get_device() call (diff) | |
download | linux-2707dbd09a859b7205917f9baf9d0192944ac46c.tar.xz linux-2707dbd09a859b7205917f9baf9d0192944ac46c.zip |
Merge branches 'thermal-core-fix', 'thermal-soc' and 'thermal-int340x' into next