diff options
| author |   Dave Airlie <airlied@redhat.com> | 2020-09-09 07:46:32 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-09-09 07:46:32 +1000 |
| commit | 61d98185b41c5ddc442fcfef7dd5a7b289ef69f5 (patch) | |
| tree | 79072e91dfaf2b916fae925a96a845d5a885bcef /drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | |
| parent | Merge tag 'amd-drm-next-5.10-2020-09-03' of git://people.freedesktop.org/~agd5f/linux into drm-next (diff) | |
| parent | Merge tag 'drm-fixes-2020-09-08' of git://anongit.freedesktop.org/drm/drm (diff) | |
| download | linux-dev-61d98185b41c5ddc442fcfef7dd5a7b289ef69f5.tar.xz linux-dev-61d98185b41c5ddc442fcfef7dd5a7b289ef69f5.zip | |
Backmerge drm-fixes merge into drm-next
Commit '6f6a73c8b715d595977774d48450a734297ab21f' from Linus' tree
The fixes reverts cause a bit of a conflict pain with intel next,
start fixing it up here.
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