Merge tag 'docs-5.9-2' of git://git.lwn.net/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Aug 2020 20:57:45 +0000 (13:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Aug 2020 20:57:45 +0000 (13:57 -0700)
commitdddcbc139e96bd18d8c65ef7b7e440f0d32457c2
tree89691f5db5864a249640210902e3f418a1b7555a
parent990f227371a400c0fbcb98b75c91a7dbd65f6132
parent1edcd4675e44dc0e6e3b34e8e29000d8a05f998c
Merge tag 'docs-5.9-2' of git://git.lwn.net/linux

Pull documentation fixes from Jonathan Corbet:
 "A handful of obvious fixes that wandered in during the merge window"

* tag 'docs-5.9-2' of git://git.lwn.net/linux:
  Documentation/locking/locktypes: fix the typo
  doc/zh_CN: resolve undefined label warning in admin-guide index
  doc/zh_CN: fix title heading markup in admin-guide cpu-load
  docs: remove the 2.6 "Upgrading I2C Drivers" guide
  docs: Correct the release date of 5.2 stable
  mailmap: Update comments for with format and more detalis
  docs: cdrom: Fix a typo and rst markup
  Doc: admin-guide: use correct legends in kernel-parameters.txt
  Documentation/features: refresh RISC-V arch support files
  documentation: coccinelle: Improve command example for make C={1,2}
  Core-api: Documentation: Replace deprecated :c:func: Usage
  Dev-tools: Documentation: Replace deprecated :c:func: Usage
  Filesystems: Documentation: Replace deprecated :c:func: Usage
  docs: trace: fix a typo
.mailmap
Documentation/admin-guide/kernel-parameters.txt
Documentation/cdrom/cdrom-standard.rst
Documentation/features/debug/stackprotector/arch-support.txt
Documentation/features/locking/lockdep/arch-support.txt
Documentation/features/time/context-tracking/arch-support.txt