Merge v4.20-rc4 into drm-next
authorDave Airlie <airlied@redhat.com>
Thu, 29 Nov 2018 00:34:03 +0000 (10:34 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 29 Nov 2018 00:34:03 +0000 (10:34 +1000)
Requested by Boris Brezillon for some vc4 fixes that are needed for future vc4 work.

Signed-off-by: Dave Airlie <airlied@redhat.com>
1  2 
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/vc4/vc4_plane.c
drivers/media/i2c/tc358743.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge