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

Need to pick up the following patch to fix htmldocs build 167bfe5 ("Documentation: drm: Remove dangling pointer from drm-mm.rst") Signed-off-by: Sean Paul <seanpaul@chromium.org>
mariux64 · Nov 30, 2018 · f6d266c · f6d266c
2 parents 2c2853f + 167bfe5
commit f6d266c
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/Documentation/gpu/drm-mm.rst b/Documentation/gpu/drm-mm.rst
@@ -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.
 
-.. kernel-doc:: drivers/gpu/drm/drm_global.c
-   :export:
-
 
 The Graphics Execution Manager (GEM)
 ====================================