Merge branch 'docs-fixes' into docs-next
authorJonathan Corbet <corbet@lwn.net>
Fri, 26 Jun 2020 15:36:23 +0000 (09:36 -0600)
committerJonathan Corbet <corbet@lwn.net>
Fri, 26 Jun 2020 15:36:23 +0000 (09:36 -0600)
Bring a handful of (relatively) urgent fixes into docs-next as well.

1  2 
.mailmap
MAINTAINERS

diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
Simple merge