Merge branch 'eduardo-soc-thermal' into thermal-soc
authorZhang Rui <rui.zhang@intel.com>
Tue, 9 Dec 2014 03:38:34 +0000 (11:38 +0800)
committerZhang Rui <rui.zhang@intel.com>
Tue, 9 Dec 2014 03:38:34 +0000 (11:38 +0800)

Trivial merge