Merge branch 'jani-rest' into docs-next
authorJonathan Corbet <corbet@lwn.net>
Sat, 14 May 2016 16:21:57 +0000 (10:21 -0600)
committerJonathan Corbet <corbet@lwn.net>
Sat, 14 May 2016 16:21:57 +0000 (10:21 -0600)
commit022eedeebfdd54c67c7c3b8ef4f5ff42b4ba0cc5
treec017f856afff21e5b07bb380f0eb0518bef1ebf1
parentb79ef07d205c6504e701b48380d33fe2bab78ec5
parent0e95abf9be3108498128458ffb087209e0a1b5fa
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.