tree 80e425d58f0052fddc1fb7e211c8f0a943cfb544
parent f53345e8cf027d03187b9417f1f8883c516e1a5b
parent 6c75a5d1131eba90fcf04adc586167e65afc79b0
author Zhang Rui <rui.zhang@intel.com> 1484900694 +0800
committer Zhang Rui <rui.zhang@intel.com> 1484900694 +0800

Merge branches 'thermal-core' and 'thermal-soc' into for-rc