Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next
authorZhang Rui <rui.zhang@intel.com>
Mon, 14 Mar 2016 23:54:06 +0000 (07:54 +0800)
committerZhang Rui <rui.zhang@intel.com>
Mon, 14 Mar 2016 23:54:06 +0000 (07:54 +0800)

Trivial merge