| commit | c24889167583c2e7fbd1a9e12ef508c8405f6fd4 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Dec 13 10:36:39 2016 +0100 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Tue Dec 13 10:36:39 2016 +0100 |
| tree | 4be6b8654d135b554253b6ab22c314260a413751 | |
| parent | 38bf57fa7b671f2bf7530888aa8199450265c5c8 [diff] | |
| parent | 868c97a846a73e937d835b09b8c885a69df50ec8 [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>