diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2021-06-10 12:18:54 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2021-06-10 12:18:54 +0200 |
| commit | 86441fa29e57940eeb00f35fefb1853c1fbe67bb (patch) | |
| tree | 270384ffe46fed769d171870e4f7951cbc411bec /Documentation/gpu/index.rst | |
| parent | d098775ed44021293b1962dea61efb19297b8d02 (diff) | |
| parent | c707b73f0cfb1acc94a20389aecde65e6385349b (diff) | |
Merge drm/drm-next into drm-misc-nextdrm-misc-next-2021-06-10
Backmerging to pick up the latest TTM patches plus conflict resolution.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'Documentation/gpu/index.rst')
| -rw-r--r-- | Documentation/gpu/index.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/gpu/index.rst b/Documentation/gpu/index.rst index ec4bc72438e4..b9c1214d8f23 100644 --- a/Documentation/gpu/index.rst +++ b/Documentation/gpu/index.rst @@ -10,6 +10,7 @@ Linux GPU Driver Developer's Guide drm-kms drm-kms-helpers drm-uapi + driver-uapi drm-client drivers backlight |