git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3393649 f4d51df)

author	Dave Airlie <airlied@redhat.com>
	Tue, 8 Sep 2020 04:41:40 +0000 (14:41 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Tue, 8 Sep 2020 04:41:40 +0000 (14:41 +1000)
commit	ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf
tree	3a54614d597b7b92ada36c5ea26dc994216b628b	tree \| snapshot
parent	3393649977f9a8847c659e282ea290d4b703295c	commit \| diff
parent	f4d51dffc6c01a9e94650d95ce0104964f8ae822	commit \| diff

Merge tag 'v5.9-rc4' into drm-next

Backmerge 5.9-rc4 as there is a nasty qxl conflict
that needs to be resolved.

Signed-off-by: Dave Airlie <airlied@redhat.com>

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ast/ast_main.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/bridge/ti-sn65dsi86.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_dp_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/exynos/exynos_drm_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_cdclk.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_ddi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_dpll_mgr.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/display/intel_sprite.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/omapdrm/dss/venc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/qxl/qxl_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun4i_tcon.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/ttm/ttm_bo_vm.c	diff1 \|	diff2 \|	blob \| history

MicroBlaze GIT Repository