]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next
authorZhang Rui <rui.zhang@intel.com>
Mon, 15 Jan 2018 05:57:18 +0000 (13:57 +0800)
committerZhang Rui <rui.zhang@intel.com>
Mon, 15 Jan 2018 05:57:18 +0000 (13:57 +0800)

Trivial merge