aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/networking/filter.txt
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2016-05-14 10:21:57 -0600
committerJonathan Corbet <corbet@lwn.net>2016-05-14 10:21:57 -0600
commit022eedeebfdd54c67c7c3b8ef4f5ff42b4ba0cc5 (patch)
treec017f856afff21e5b07bb380f0eb0518bef1ebf1 /Documentation/networking/filter.txt
parentserial: doc: Use port->state instead of info (diff)
parentdocproc: print a comment about autogeneration for rst output (diff)
downloadlinux-dev-022eedeebfdd54c67c7c3b8ef4f5ff42b4ba0cc5.tar.xz
linux-dev-022eedeebfdd54c67c7c3b8ef4f5ff42b4ba0cc5.zip
Merge branch 'jani-rest' into docs-next
Patch series from Jani Nikula: > Jon, I was hoping we could consider nudging things forward a bit in the > kernel-doc and docproc reStructuredText front already in 4.7. I know > it's a bit close to the merge window, but this should not interfere with > anything else, and some of it are just trivial cleanups that I've been > carrying around locally. > > Obviously this doesn't actually add anything that uses them yet, but I > think it would be helpful to have some common base in to ease > collaboration.
Diffstat (limited to 'Documentation/networking/filter.txt')
0 files changed, 0 insertions, 0 deletions