Merge remote-tracking branch 'drm-intel/for-linux-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Apr 2021 03:31:35 +0000 (13:31 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 14 Apr 2021 03:31:35 +0000 (13:31 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 03:31:35 +0000 (13:31 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 03:31:35 +0000 (13:31 +1000)
diff --cc drivers/gpu/drm/i915/display/skl_universal_plane.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 03:31:35 +0000 (13:31 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 03:31:35 +0000 (13:31 +1000)