Merge branches 'intel-dts-soc-thermal' and 'int340x-enhancement' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 30 Jan 2015 08:16:25 +0000 (16:16 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 30 Jan 2015 08:16:25 +0000 (16:16 +0800)

Trivial merge