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)

Trivial merge