diff options
author | Zhang Rui <rui.zhang@intel.com> | 2016-01-23 04:43:27 +0100 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2016-01-23 04:43:27 +0100 |
commit | 98d94507e10c3c0a5cfc1c3ac4df23e761f1b874 (patch) | |
tree | fcdfd143e4b623f77835e8814eb014f47d4fe79e | |
parent | Thermal: Enable Broxton SoC thermal reporting device (diff) | |
parent | Thermal: do thermal zone update after a cooling device registered (diff) | |
parent | thermal: trip_point_temp_store() calls thermal_zone_device_update() (diff) | |
download | linux-98d94507e10c3c0a5cfc1c3ac4df23e761f1b874.tar.xz linux-98d94507e10c3c0a5cfc1c3ac4df23e761f1b874.zip |
Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next