aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2020-09-08 14:41:40 +1000
committerDave Airlie <airlied@redhat.com>2020-09-08 14:41:40 +1000
commitce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf (patch)
tree3a54614d597b7b92ada36c5ea26dc994216b628b /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
parentMerge tag 'drm-intel-next-2020-08-24-1' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (diff)
parentLinux 5.9-rc4 (diff)
downloadlinux-dev-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.tar.xz
linux-dev-ce5c207c6b8dd9cdeaeeb2345b8a69335c0d98bf.zip
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>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
0 files changed, 0 insertions, 0 deletions