Merge branches 'thermal-core', 'thermal-soc' and 'thermal-int340x' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Wed, 24 Dec 2014 02:38:30 +0000 (10:38 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 24 Dec 2014 02:38:30 +0000 (10:38 +0800)

Trivial merge