diff options
author | 2021-05-11 15:59:18 +0200 | |
---|---|---|
committer | 2021-05-11 15:59:18 +0200 | |
commit | fd531024bad7e5799e968ca70c0d3ca7b96b71ef (patch) | |
tree | a6abb8be6a97c632a1327547a30c7119365e62c0 /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
parent | drm: Include <asm/agp.h> iff CONFIG_AGP is set (diff) | |
parent | Linux 5.13-rc1 (diff) | |
download | linux-dev-fd531024bad7e5799e968ca70c0d3ca7b96b71ef.tar.xz linux-dev-fd531024bad7e5799e968ca70c0d3ca7b96b71ef.zip |
Merge drm/drm-next into drm-misc-next
Backmerging to get v5.12 fixes. Requested for vmwgfx.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_object.c')
0 files changed, 0 insertions, 0 deletions