diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2022-08-01 16:54:52 +0300 |
---|---|---|
committer | Thomas Zimmermann <tzimmermann@suse.de> | 2022-08-01 17:04:00 +0300 |
commit | 9cf26c8968b358bb14cc078f8153300a493613d4 (patch) | |
tree | cb560226137022539f1ddaa9292f64a35ea5f736 /Documentation/gpu/amdgpu/amdgpu-glossary.rst | |
parent | d4a3e50ffd9084e3eafb318e95ca91b5895a6e62 (diff) | |
parent | 2bc7ea71a73747a77e7f83bc085b0d2393235410 (diff) | |
download | linux-9cf26c8968b358bb14cc078f8153300a493613d4.tar.xz |
Merge drm/drm-next into drm-misc-next
Backmerging to pick up fixes from amdgpu.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'Documentation/gpu/amdgpu/amdgpu-glossary.rst')
-rw-r--r-- | Documentation/gpu/amdgpu/amdgpu-glossary.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gpu/amdgpu/amdgpu-glossary.rst b/Documentation/gpu/amdgpu/amdgpu-glossary.rst index db924d37f93e..326896e9800d 100644 --- a/Documentation/gpu/amdgpu/amdgpu-glossary.rst +++ b/Documentation/gpu/amdgpu/amdgpu-glossary.rst @@ -75,7 +75,7 @@ we have a dedicated glossary for Display Core at PSP Platform Security Processor - RCL + RLC RunList Controller SDMA |