| commit | 111b23cf895b5cbcdc1b2c6580be1bb78a577d05 | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Thu Jun 11 12:52:14 2015 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Thu Jun 11 12:52:14 2015 +0800 |
| tree | 89b840115ccd753216ba0b26e587e52699b99310 | |
| parent | 6a6bcf08e5d1834447655a762dfaf552b675cc54 [diff] | |
| parent | 53daf9383f34d7bf61358a37449fb4d59fbdafc2 [diff] |
Merge branches 'release' and 'thermal-soc' of .git into next