Merge branches 'thermal-core' and 'thermal-intel' into next

This commit is contained in:
Zhang Rui 2019-06-28 09:15:17 +08:00
commit ff9b011ad1