tree 5974ef02240a16194c9db3a93427991c56a9b30c
parent e6e9c9b238e49e4973391078952b34d3bde3df99
parent 547218864afb2745d9d137f005f3380ef96b26ab
author Mauro Carvalho Chehab <mchehab@s-opensource.com> 1468578827 -0300
committer Mauro Carvalho Chehab <mchehab@s-opensource.com> 1468578827 -0300

Merge branch 'docs-next' of git://git.lwn.net/linux into devel/docs-next

* 'docs-next' of git://git.lwn.net/linux:
  doc-rst: add an option to ignore DocBooks when generating docs
  workqueue: Fix a typo in workqueue.txt
  Doc: ocfs: Fix typo in filesystems/ocfs2-online-filecheck.txt
  Documentation/sphinx: skip build if user requested specific DOCBOOKS
  Documentation: add cleanmediadocs to the documentation targets