Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next
authorZhang Rui <rui.zhang@intel.com>
Wed, 18 May 2016 07:37:08 +0000 (15:37 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 18 May 2016 07:37:08 +0000 (15:37 +0800)

Trivial merge