Merge branches 'thermal-intel' and 'thermal-core' into next
authorZhang Rui <rui.zhang@intel.com>
Mon, 8 Aug 2016 02:59:35 +0000 (10:59 +0800)
committerZhang Rui <rui.zhang@intel.com>
Mon, 8 Aug 2016 02:59:35 +0000 (10:59 +0800)

Trivial merge