Merge branches 'thermal-core', 'thermal-intel', 'thermal-soc-fixes' and 'thermal...
authorZhang Rui <rui.zhang@intel.com>
Wed, 30 Nov 2016 02:26:38 +0000 (10:26 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 30 Nov 2016 02:26:38 +0000 (10:26 +0800)

Trivial merge