Merge remote-tracking branch 'origin/master' into oreo-x86

author Chih-Wei Huang <cwhuang@linux.org.tw>

Fri, 2 Nov 2018 06:45:27 +0000 (14:45 +0800)

committer Chih-Wei Huang <cwhuang@linux.org.tw>

Fri, 2 Nov 2018 06:45:27 +0000 (14:45 +0800)
author Chih-Wei Huang <cwhuang@linux.org.tw>
Fri, 2 Nov 2018 06:45:27 +0000 (14:45 +0800)
committer Chih-Wei Huang <cwhuang@linux.org.tw>
Fri, 2 Nov 2018 06:45:27 +0000 (14:45 +0800)
diff --cc drmconnector.cpp
Simple merge
diff --cc drmdisplaycompositor.cpp
Simple merge
diff --cc drmhwctwo.cpp
Simple merge
diff --cc glworker.cpp
Simple merge
author	Chih-Wei Huang <cwhuang@linux.org.tw>
	Fri, 2 Nov 2018 06:45:27 +0000 (14:45 +0800)
committer	Chih-Wei Huang <cwhuang@linux.org.tw>
	Fri, 2 Nov 2018 06:45:27 +0000 (14:45 +0800)
		1	2
drmconnector.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
drmdisplaycompositor.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
drmhwctwo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
glworker.cpp	patch \|	diff1 \|	diff2 \|	blob \| history