Merge branches 'thermal-core' and 'thermal-intel' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Wed, 2 Sep 2015 02:08:02 +0000 (10:08 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 2 Sep 2015 02:08:02 +0000 (10:08 +0800)

Trivial merge