Merge branches 'thermal-core', 'thermal-built-it' and 'thermal-intel' into next

author Zhang Rui <rui.zhang@intel.com>

Tue, 7 May 2019 13:54:11 +0000 (21:54 +0800)

committer Zhang Rui <rui.zhang@intel.com>

Tue, 7 May 2019 13:54:11 +0000 (21:54 +0800)
author Zhang Rui <rui.zhang@intel.com>
Tue, 7 May 2019 13:54:11 +0000 (21:54 +0800)
committer Zhang Rui <rui.zhang@intel.com>
Tue, 7 May 2019 13:54:11 +0000 (21:54 +0800)
diff --cc drivers/thermal/thermal_core.c
Simple merge
author	Zhang Rui <rui.zhang@intel.com>
	Tue, 7 May 2019 13:54:11 +0000 (21:54 +0800)
committer	Zhang Rui <rui.zhang@intel.com>
	Tue, 7 May 2019 13:54:11 +0000 (21:54 +0800)