summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2019-05-07 15:54:11 +0200
committerZhang Rui <rui.zhang@intel.com>2019-05-07 15:54:11 +0200
commit6df24c3e81b9ba9c5e8d815e593826c169e3f366 (patch)
tree4a9ff7f51fb4e385ebd47e9d2dcd1457a115fc53 /drivers
parentthermal: core: skip update disabled thermal zones after suspend (diff)
parentmlxsw: Remove obsolete dependency on THERMAL=m (diff)
parentdrivers: thermal: processor_thermal: Downgrade error message (diff)
downloadlinux-6df24c3e81b9ba9c5e8d815e593826c169e3f366.tar.xz
linux-6df24c3e81b9ba9c5e8d815e593826c169e3f366.zip
Merge branches 'thermal-core', 'thermal-built-it' and 'thermal-intel' into next