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

Need to pick up the following patch to fix htmldocs build

167bfe534d ("Documentation: drm: Remove dangling pointer from drm-mm.rst")

Signed-off-by: Sean Paul <seanpaul@chromium.org>
This commit is contained in:
Sean Paul 2018-11-30 08:47:01 -05:00
commit f6d266c279

View File

@ -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)
====================================