tree f7f86ccc559311f0ae7fe42f479bea50bc543c59
parent 6ff7b7aff34a4c21953ebf360d8941aeec0a215e
parent 2cfd100bf2f7d979c0ecaf0298f3de2f03ac9d5d
author Mauro Carvalho Chehab <mchehab@s-opensource.com> 1474313726 -0300
committer Mauro Carvalho Chehab <mchehab@s-opensource.com> 1474313801 -0300

Merge tag 'docs-next' of git://git.lwn.net/linux.git into patchwork

Merge back from docs-next in order to get the cdomain extension.

With such extension, the number of warnings when building docs
in nitpick mode reduced from 22 to 2 warnings.

* docs-next/docs-next:
  docs/driver-model: fix typo
  DMA-API-HOWTO: <asm/generic/scatterlist.h> is no more
  doc-rst:c-domain: function-like macros arguments
  doc-rst:c-domain: fix sphinx version incompatibility
  Documentation/filesystems: Fixed typo
  docs: Don't format internal MPT docs
  docs: split up serial-interfaces.rst
  docs: Pull the HSI documentation together
  docs: Special-case function-pointer parameters in kernel-doc
  docs: make kernel-doc handle varargs properly
  x86: fix memory ranges in mm documentation
  documentation/scsi: Remove nodisconnect parameter
  doc: ioctl: Add some clarifications to botching-up-ioctls
  docs: split up the driver book
  Docs: sphinxify device-drivers.tmpl