Merge tag 'docs-4.11-fixes' of git://git.lwn.net/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Mar 2017 19:32:18 +0000 (11:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 4 Mar 2017 19:32:18 +0000 (11:32 -0800)
commitbe834aafdf5f8a37c191e697ac8ee6d53ab5020c
treee5c4bce3fd97c046c7367b9eb46d25b35c2f84aa
parent91aff98b79f10bf38c0d51b2d8538ecca35f916e
parentfd5d666932d51b2552ecc0280047d6b35d9b6cd1
Merge tag 'docs-4.11-fixes' of git://git.lwn.net/linux

Pull documentation fixes from Jonathan Corbet:
 "A few fixes for the docs tree, including one for a 4.11 build
  regression"

* tag 'docs-4.11-fixes' of git://git.lwn.net/linux:
  Documentation/sphinx: fix primary_domain configuration
  docs: Fix htmldocs build failure
  doc/ko_KR/memory-barriers: Update control-dependencies section
  pcieaer doc: update the link
  Documentation: Update path to sysrq.txt
Documentation/DocBook/Makefile