path: root/.mailmap
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2020-08-13 13:57:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-08-13 13:57:45 -0700
commitdddcbc139e96bd18d8c65ef7b7e440f0d32457c2 (patch)
tree89691f5db5864a249640210902e3f418a1b7555a /.mailmap
parent990f227371a400c0fbcb98b75c91a7dbd65f6132 (diff)
parent1edcd4675e44dc0e6e3b34e8e29000d8a05f998c (diff)
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
Diffstat (limited to '.mailmap')
1 files changed, 7 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index a96f1b38fa58..83d8d0158f3b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,11 +2,16 @@
# This list is used by git-shortlog to fix a few botched name translations
# in the git archive, either because the author's full name was messed up
# and/or not always written the same way, making contributions from the
-# same person appearing not to be so or badly displayed.
+# same person appearing not to be so or badly displayed. Also allows for
+# old email addresses to map to new email addresses.
+# For format details, see "MAPPING AUTHORS" in "man git-shortlog".
+# Please keep this list dictionary sorted.
+# This comment is parsed by git-shortlog:
# repo-abbrev: /pub/scm/linux/kernel/git/
Aaron Durbin <adurbin@google.com>
Adam Oldham <oldhamca@gmail.com>
Adam Radford <aradford@gmail.com>

Privacy Policy