| commit | 6fefe19f583625ca4ea3ecc9128baa51c31c60a4 | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Wed Feb 22 15:35:06 2017 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Wed Feb 22 15:35:06 2017 +0800 |
| tree | 48bbd4773378bc285f30edb813de8899cde0d245 | |
| parent | d9cc34a6e1a8e7d26d243c54fa6cef93556d44f2 [diff] | |
| parent | ee73bcdb0b1aab35654912d10f07da0176848a87 [diff] | |
| parent | da8c1c46f2082ce4a094812806d7eab3c17a4817 [diff] | |
| parent | 2f96c035fbd143695eec5b465c98bcc52732626e [diff] |
Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion' into next