Merge tag 'docs-4.10' of git://git.lwn.net/linux into drm-misc-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 13 Dec 2016 09:36:39 +0000 (10:36 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 13 Dec 2016 09:36:39 +0000 (10:36 +0100)
Backmerge the docs-next branch from Jon into drm-misc so that we can
apply the dma-buf documentation cleanup patches. Git found a conflict
where there was none because both drm-misc and docs had identical
patches to clean up file rename issues in the rst include directives.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
1  2 
Documentation/gpu/drm-kms.rst
MAINTAINERS
lib/Kconfig.debug

Simple merge
diff --cc MAINTAINERS
Simple merge
Simple merge