Merge tag 'inclusive-terminology' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Jul 2020 04:15:25 +0000 (21:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Jul 2020 04:15:25 +0000 (21:15 -0700)
commit49decddd39e5f6132ccd7d9fdc3d7c470b0061bb
treec1bed64f71f65ca4ddc234fefc668e00c675ca03
parent5a764898afec0bc097003e8c3e727792289f76d6
parenta5f526ecb075a08c4a082355020166c7fe13ae27
Merge tag 'inclusive-terminology' of git://git./linux/kernel/git/djbw/linux

Pull coding style terminology documentation from Dan Williams:
 "The discussion has tapered off as well as the incoming ack, review,
  and sign-off tags. I did not see a reason to wait for the next merge
  window"

* tag 'inclusive-terminology' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux:
  CodingStyle: Inclusive Terminology