summaryrefslogtreecommitdiff
path: root/drivers/thermal
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2017-11-02 16:32:25 +0800
committerZhang Rui <rui.zhang@intel.com>2017-11-02 16:32:25 +0800
commit1e032393d9680c1f3b5238ec0f3f4eb006ee83d2 (patch)
treeda2ce086d804a68b8eee453921026037637a9ed2 /drivers/thermal
parent023b7b07ccb57317bee4d971be546cc4469f4e7e (diff)
parent501a5c71d1f754e44142af6cae59042a8c3b2a11 (diff)
parent6ed5ed14e25914dab92ed492565f6feb80ae0559 (diff)
parentfe9ba5bc73af01f7d53bb6b2b31204f799dd09be (diff)
Merge branches 'thermal-core', 'thermal-tool', 'thermal-intel' and 'thermal-soc' into next