From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 May 2017 18:29:52 +0000 (-0700)
Subject: Merge tag 'docs-4.12-2' of git://git.lwn.net/linux
X-Git-Tag: v4.12-rc1~20
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=09d79d103371b1b7ea70ea7f9c05ac207ef22f5d;p=linux-2.6-block.git

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

Pull more documentation updates from Jonathan Corbet:
 "Connect the newly RST-formatted documentation to the rest; this had to
  wait until the input pull was done. There's also a few small fixes
  that wandered in"

* tag 'docs-4.12-2' of git://git.lwn.net/linux:
  doc: replace FTP URL to kernel.org with HTTPS one
  docs: update references to the device io book
  Documentation: earlycon: fix Marvell Armada 3700 UART name
  docs-rst: add input docs at main index and use kernel-figure
---

09d79d103371b1b7ea70ea7f9c05ac207ef22f5d