| commit | 8cb68501e1e9c2093e0997eaf8dd45a8bceeefc0 | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Fri Jan 30 16:16:25 2015 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Fri Jan 30 16:16:25 2015 +0800 |
| tree | 0cf883c0ef19facc11413276f5bf6c7c5093d53d | |
| parent | 6c355fafeb2cde3fa6bf317777ae3018b7f254e6 [diff] | |
| parent | 317d9dda0522c18eb230367c88601c2e46cda4f8 [diff] |
Merge branches 'intel-dts-soc-thermal' and 'int340x-enhancement' of .git into next