Merge branches 'thermal-core' and 'thermal-soc' into for-rc
authorZhang Rui <rui.zhang@intel.com>
Fri, 20 Jan 2017 08:24:54 +0000 (16:24 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 20 Jan 2017 08:24:54 +0000 (16:24 +0800)
commitbad94f8068122b6342a73a218dad7d41e6ea907b
tree80e425d58f0052fddc1fb7e211c8f0a943cfb544
parentf53345e8cf027d03187b9417f1f8883c516e1a5b
parent6c75a5d1131eba90fcf04adc586167e65afc79b0
Merge branches 'thermal-core' and 'thermal-soc' into for-rc