From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Feb 2018 17:42:59 +0000 (-0800)
Subject: Merge tag 'docs-4.16-2' of git://git.lwn.net/linux
X-Git-Tag: v5.15~9447
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e03ab6c4ade684bf5d2bf53674440bcb6f476949;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'docs-4.16-2' of git://git.lwn.net/linux

Pull more documentation updates from Jonathan Corbet:
 "A few late-arriving fixes, along with Konstantin's PGP document that
  had no reason to wait another cycle"

* tag 'docs-4.16-2' of git://git.lwn.net/linux:
  Documentation/process: tweak pgp maintainer guide
  Documentation/admin-guide: fixes for thunderbolt.rst
  Documentation: mips: Update AU1xxx_IDE Kconfig dependencies
  Fix broken link in Documentation/process/kernel-docs.rst
  Documentation/process: kernel maintainer PGP guide
---

e03ab6c4ade684bf5d2bf53674440bcb6f476949