]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
commit1ec28f8b8ada4e4f77d1af006a3a474f4f83b8e3
tree2e810e02a66cdec0bc82a8555796b7083ad03416
parent61647c77cb15354a329cbb36fe7a2253b36b51b1
parent2e6e902d185027f8e3cb8b7305238f7e35d6a436
Merge v4.20-rc4 into drm-next

Requested by Boris Brezillon for some vc4 fixes that are needed for future vc4 work.

Signed-off-by: Dave Airlie <airlied@redhat.com>
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