Skip to content
Commit 41206a07 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge v5.8-rc6 into drm-next



I've got a silent conflict + two trees based on fixes to merge.

Fixes a silent merge with amdgpu

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents 20673911 ba47d845
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment