summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2018-04-13 09:11:53 +0300
committerZhang Rui <rui.zhang@intel.com>2018-04-13 09:11:53 +0300
commitb907b408ca64482989cd95dacef804ce509a3673 (patch)
tree3c9a139b01367788f50cc3fcefb5d042d6051402 /include/linux
parent8ea229511e06f9635ecc338dcbe0db41a73623f0 (diff)
parentcf1ba1d73a33944d8c1a75370a35434bf146b8a7 (diff)
downloadlinux-b907b408ca64482989cd95dacef804ce509a3673.tar.xz
Merge branches 'thermal-core' and 'thermal-soc' into next
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions