From: Daniel Vetter Date: Tue, 13 Dec 2016 09:36:39 +0000 (+0100) Subject: Merge tag 'docs-4.10' of git://git.lwn.net/linux into drm-misc-next X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c24889167583c2e7fbd1a9e12ef508c8405f6fd4;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge tag 'docs-4.10' of git://git.lwn.net/linux into drm-misc-next 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 --- c24889167583c2e7fbd1a9e12ef508c8405f6fd4