Merge branch 'backup-thermal-shutdown' into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 5 May 2017 12:30:09 +0000 (20:30 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 5 May 2017 12:30:09 +0000 (20:30 +0800)
commitbb4d5e38decf3f3c6bf170d19603949abb4d4b99
tree7c2c83431a91b238511120a7a137daffb053185f
parenta6128f47f7940d8388ca7c8623fbe24e52f8fae6
parentef1d87e06ab4d3f9a95f02517ecc50902dc233a7
Merge branch 'backup-thermal-shutdown' into next