projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cfc79ae ff690ee)
Merge tag 'docs-4.16-fix' of git://git.lwn.net/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Mar 2018 00:45:57 +0000 (16:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Mar 2018 00:45:57 +0000 (16:45 -0800)
Pull Documentation build fix from Jonathan Corbet:
 "The Sphinx 1.7 release broke the build process for reasons that are
  mostly our fault.

  This is a single fix cherry-picked from docs-next that restores docs
  buildability for all supported Sphinx versions"

* tag 'docs-4.16-fix' of git://git.lwn.net/linux:
  Documentation/sphinx: Fix Directive import error


Trivial merge
John Crispins staging tree