| commit | 88ac99063e6e38bf9577e75f0d65dd02e2326d58 | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Wed May 18 15:37:08 2016 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Wed May 18 15:37:08 2016 +0800 |
| tree | b04a8677c0bbd2c64d0dfe3957bf32287813a148 | |
| parent | 191b07541fcdd1de1ccc71d00bc28ca5060dd484 [diff] | |
| parent | 5af897e433e6ba2963c0edcb12f2f75c53d5fae4 [diff] | |
| parent | 431c30f74cdffba6456b52742e80f9b629228940 [diff] |
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next