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>
This commit is contained in:
@@ -59,4 +59,4 @@ o FIXME: decide on a sane test naming scheme. Currently the tests are named
|
||||
Coding Style
|
||||
------------
|
||||
o The Futex Test project adheres to the coding standards set forth by Linux
|
||||
kernel as defined in the Linux source Documentation/CodingStyle.
|
||||
kernel as defined in the Linux source Documentation/process/coding-style.rst.
|
||||
|
Reference in New Issue
Block a user