summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2015-09-02 04:08:02 +0200
committerZhang Rui <rui.zhang@intel.com>2015-09-02 04:08:02 +0200
commit5a924a07f882e866f2337bf65048be357956691a (patch)
tree9044da89d0057e67ddd968fbf57f848e6b591bc9 /drivers/platform
parentLinux 4.2 (diff)
parentthermal: Add comment explaining test for critical temperature (diff)
parentthermal: Add Intel PCH thermal driver (diff)
downloadlinux-5a924a07f882e866f2337bf65048be357956691a.tar.xz
linux-5a924a07f882e866f2337bf65048be357956691a.zip
Merge branches 'thermal-core' and 'thermal-intel' of .git into next