summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2019-05-07 16:54:11 +0300
committerZhang Rui <rui.zhang@intel.com>2019-05-07 16:54:11 +0300
commit6df24c3e81b9ba9c5e8d815e593826c169e3f366 (patch)
tree4a9ff7f51fb4e385ebd47e9d2dcd1457a115fc53 /include/linux
parentff54bbd1beb24224e82cfe3e76668ee79ff32945 (diff)
parent980d43f24d59491aa1c5552171454ac25fb86ea2 (diff)
parent44c0c23725a16c8803b8809b87651405e8741e4d (diff)
downloadlinux-6df24c3e81b9ba9c5e8d815e593826c169e3f366.tar.xz
Merge branches 'thermal-core', 'thermal-built-it' and 'thermal-intel' into next