diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-12-13 12:25:19 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-12-13 12:25:19 +0800 |
| commit | 2707dbd09a859b7205917f9baf9d0192944ac46c (patch) | |
| tree | 867352adee19affe11530c953dea3d89b27cad2a | |
| parent | af6c9f1657ca6d2ef2b2c0e31ad17c6fbf773baf (diff) | |
| parent | c89d99546dc5b076ccd6692c48ada9a92820a4ac (diff) | |
| parent | e413ad7cca9f541659ac0ddf8f37e2bcfade365a (diff) | |
Merge branches 'thermal-core-fix', 'thermal-soc' and 'thermal-int340x' into next