Merge branches 'release' and 'thermal-soc' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Thu, 11 Jun 2015 04:52:14 +0000 (12:52 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 11 Jun 2015 04:52:14 +0000 (12:52 +0800)

Trivial merge