diff options
author | Zhang Rui <rui.zhang@intel.com> | 2019-05-07 15:54:11 +0200 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2019-05-07 15:54:11 +0200 |
commit | 6df24c3e81b9ba9c5e8d815e593826c169e3f366 (patch) | |
tree | 4a9ff7f51fb4e385ebd47e9d2dcd1457a115fc53 /arch/arm/configs/s3c6400_defconfig | |
parent | thermal: core: skip update disabled thermal zones after suspend (diff) | |
parent | mlxsw: Remove obsolete dependency on THERMAL=m (diff) | |
parent | drivers: thermal: processor_thermal: Downgrade error message (diff) | |
download | linux-6df24c3e81b9ba9c5e8d815e593826c169e3f366.tar.xz linux-6df24c3e81b9ba9c5e8d815e593826c169e3f366.zip |
Merge branches 'thermal-core', 'thermal-built-it' and 'thermal-intel' into next