| commit | 1577ddfac75ff9690ebd0d210bc7f1345c9d29ef | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Mon Aug 08 10:59:35 2016 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Mon Aug 08 10:59:35 2016 +0800 |
| tree | af9d348ccc26df846c7c69e62624465f42205745 | |
| parent | 70c50ee72eebb3d1e3aae7450269fd8d8074c610 [diff] | |
| parent | 165989a5b667b90589f21c8affe496ad21f08591 [diff] |
Merge branches 'thermal-intel' and 'thermal-core' into next