Merge branches 'thermal-core' and 'thermal-soc' into for-rc
authorZhang Rui <rui.zhang@intel.com>
Fri, 20 Jan 2017 08:24:54 +0000 (16:24 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 20 Jan 2017 08:24:54 +0000 (16:24 +0800)

Trivial merge