tree 89b840115ccd753216ba0b26e587e52699b99310
parent 6a6bcf08e5d1834447655a762dfaf552b675cc54
parent 53daf9383f34d7bf61358a37449fb4d59fbdafc2
author Zhang Rui <rui.zhang@intel.com> 1433998334 +0800
committer Zhang Rui <rui.zhang@intel.com> 1433998334 +0800

Merge branches 'release' and 'thermal-soc' of .git into next