projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 38bf57f 868c97a)
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)
commitc24889167583c2e7fbd1a9e12ef508c8405f6fd4
tree4be6b8654d135b554253b6ab22c314260a413751tree | snapshot
parent38bf57fa7b671f2bf7530888aa8199450265c5c8commit | diff
parent868c97a846a73e937d835b09b8c885a69df50ec8commit | diff
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 <daniel.vetter@intel.com>
Documentation/gpu/drm-kms.rst diff1 | diff2 | blob | history
MAINTAINERS diff1 | diff2 | blob | history
lib/Kconfig.debug diff1 | diff2 | blob | history
Domain: System / Kernel;