Merge branch 'docs-next' of git://git.lwn.net/linux into devel/docs-next
authorMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 15 Jul 2016 10:33:47 +0000 (07:33 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Fri, 15 Jul 2016 10:33:47 +0000 (07:33 -0300)
* '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

1  2 
Documentation/Makefile.sphinx

Simple merge