Merge drm/drm-next into drm-intel-next

author Rodrigo Vivi <[email protected]>

Fri, 15 Jan 2021 22:52:59 +0000 (17:52 -0500)

committer Rodrigo Vivi <[email protected]>

Fri, 15 Jan 2021 22:52:59 +0000 (17:52 -0500)
author Rodrigo Vivi <[email protected]>
Fri, 15 Jan 2021 22:52:59 +0000 (17:52 -0500)
committer Rodrigo Vivi <[email protected]>
Fri, 15 Jan 2021 22:52:59 +0000 (17:52 -0500)
diff --cc drivers/gpu/drm/i915/Makefile
Simple merge
diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge
author	Rodrigo Vivi <[email protected]>
	Fri, 15 Jan 2021 22:52:59 +0000 (17:52 -0500)
committer	Rodrigo Vivi <[email protected]>
	Fri, 15 Jan 2021 22:52:59 +0000 (17:52 -0500)
		1	2
drivers/gpu/drm/i915/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	patch \|	diff1 \|	diff2 \|	blob \| history