aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index ef49ee26c1..d420abca81 100644
--- a/.mailmap
+++ b/.mailmap
@@ -12,6 +12,7 @@ Anish <anish@chelsio.com> Anish Bhatt <anish@gatech.edu>
Balint Reczey <balint@balintreczey.hu> <balint.reczey@ericsson.com>
Bartolo Otrit <bartolootrit@gmail.com> bartolootrit <bartolootrit@code.wireshark.org>
Boris Bochkarev <Boris-Bochkaryov@yandex.ru> boris.bochkarev <Boris-Bochkaryov@yandex.ru>
+Brian Whitney <brian.m.whitney@outlook.com> bwhitn <brian.m.whitney@outlook.com>
Cal Turney <cturney@charter.net> Cal Turney <cal.turney@emc.com>
Cal Turney <cturney@charter.net> cturney <cturney@charter.net>
Chris Bontje <cbontje@gmail.com> cbontje <cbontje@gmail.com>
@@ -92,10 +93,12 @@ Mikael Kanstrup <mikael.kanstrup@gmail.com> Mikael Kanstrup <mikael.kanstrup@son
Mikhail Koreshkov <drkor@hotbox.ru> unknown <drkor@hotbox.ru>
Moraney Jalil <moraney.jalil@outlook.com> moraney.jalil
Moshe Kaplan <me@moshekaplan.com> moshekaplan <me@moshekaplan.com>
+Moshe Kaplan <me@moshekaplan.com> Your Name <you@example.com>
Olga Kornievskaia <kolga@netapp.com> Olga Kornievskaia <olga.kornievskaia@gmail.com>
Øyvind Rønningstad <ronningstad@gmail.com> oyv <ronningstad@gmail.com>
Pascal Quantin <pascal.quantin@gmail.com> <pascal@localhost>
Patrick Servello <patrick.servello@gmail.com> Patrick <patrick.servello@gmail.com>
+Paul Williamson <paul@mustbeart.com> MustBeArt<paul@mustbeart.com>
Peter Ross <peter.ross@dsto.defence.gov.au> <peter.ross@rmit.edu.au>
Peter Wu <peter@lekensteyn.nl> <lekensteyn@gmail.com>
Petr Gotthard <petr.gotthard@honeywell.com> Petr Gotthard <petr.gotthard@centrum.cz>