From: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Date: Fri, 15 Jul 2016 10:33:47 +0000 (-0300)
Subject: Merge branch 'docs-next' of git://git.lwn.net/linux into devel/docs-next
X-Git-Tag: v4.8-rc1~131^2^2~120
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=425efba23509e18e39d0056799004f2005b66b15;p=cascardo%2Flinux.git

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
---

425efba23509e18e39d0056799004f2005b66b15