Commit f6d266c2 authored by Sean Paul's avatar Sean Paul

Merge drm/drm-next into drm-misc-next

Need to pick up the following patch to fix htmldocs build

167bfe53 ("Documentation: drm: Remove dangling pointer from drm-mm.rst")
Signed-off-by: default avatarSean Paul <seanpaul@chromium.org>
parents 2c2853f7 167bfe53
...@@ -79,9 +79,6 @@ count for the TTM, which will call your initialization function. ...@@ -79,9 +79,6 @@ count for the TTM, which will call your initialization function.
See the radeon_ttm.c file for an example of usage. See the radeon_ttm.c file for an example of usage.
.. kernel-doc:: drivers/gpu/drm/drm_global.c
:export:
The Graphics Execution Manager (GEM) The Graphics Execution Manager (GEM)
==================================== ====================================
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment