aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap4
-rw-r--r--AUTHORS8
2 files changed, 8 insertions, 4 deletions
diff --git a/.mailmap b/.mailmap
index 1b348072bf..216e6183db 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,6 +7,7 @@ Anders Broman <anders.broman@ericsson.com> <a.broman@bredband.net>
Anders Broman <anders.broman@ericsson.com> Anders <anders.broman@ericsson.com>
Anders Broman <anders.broman@ericsson.com> AndersBroman <anders.broman@ericsson.com>
Andy Ling <andy.ling@s-a-m.com> AndyL <andy.ling@s-a-m.com>
+Anil Kumar K K <anilkumar911@gmail.com> anilkumar911 <anilkumar911@gmail.com>
Balint Reczey <balint@balintreczey.hu> <balint.reczey@ericsson.com>
Cal Turney <cturney@charter.net> Cal Turney <cal.turney@emc.com>
Cal Turney <cturney@charter.net> cturney <cturney@charter.net>
@@ -25,6 +26,7 @@ Denis Janssen <janssend@gmail.com> janssend <janssend@gmail.com>
Didier Gautheron <dgautheron@magic.fr> didier <dgautheron@magic.fr>
Dmitry Bazhenov <dima_b@pigeonpoint.com> U-beauty\bdn <dima_b@pigeonpoint.com>
Edwin Groothuis <edwin@mavetju.org> <wireshark@mavetju.org>
+Eugene Exarevsky <eugene.exarevsky@dsr-company.com> dsrsupport <eugene.exarevsky@dsr-company.com>
Evan Huus <eapache@gmail.com> <evan.huus@jadedpixel.com>
Francesco Fondelli <francesco.fondelli@gmail.com> ff <francesco.fondelli@gmail.com>
Gerald Combs <gerald@wireshark.org> <gerald@zing.org>
@@ -53,6 +55,7 @@ Jorge Power <jpower@rsscorp.org> jorge power
Jörg Mayer <jmayer@loplof.de> Joerg Mayer <jmayer@loplof.de>
Jörg Mayer <jmayer@loplof.de> Jörg Mayer <jmayer@egg.fg-networking.de>
Joseph Huffman <jhuffman@codeaurora.org> <jhuffman@qce.qualcomm.com>
+Jose Rubio <joserubiovidales@gmail.com> clairvoyant <joserubiovidales@gmail.com>
Juan Jose Martin Carrascosa <juanjo@rti.com> Juanjo <juanjo@rti.com>
Juan Pablo Mendoza <jpablo@gmail.com> jpmendoza <jpablo@gmail.com>
Kary Rogers <kary.rogers@gmail.com> karyrogers <kary.rogers@gmail.com>
@@ -101,6 +104,7 @@ Stephen Fisher <stephenfisher@centurylink.net> <sfisher@panix.com>
Stephen Fisher <stephenfisher@centurylink.net> <sfisher@sdf.org>
Stephen Fisher <stephenfisher@centurylink.net> <stephenfisher-wireshark@outlook.com>
Stephen Fisher <stephenfisher@centurylink.net> <steve@stephen-fisher.com>
+Sumit Kumar Jha <sjha3@ncsu.edu> sjha3 <sjha3@ncsu.edu>
Thies Moeller <thies.moeller[AT]baslerweb.com> <thies.moeller@baslerweb.com>
Vikram Hegde <vikram.h@samsung.com> Vikram Hegde <vikram.h@amsung.com>
Vincent Helfre <vincent.helfre@gmx.net> Vincent Helfre <vincenthelfre@googlemail.com>
diff --git a/AUTHORS b/AUTHORS
index c970c8e88c..9222c188db 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3957,6 +3957,7 @@ Andrew Chernyh <andrew.chernyh[AT]gmail.com>
Andrew Hoag <Andrew.Hoag[AT]aireon.com>
Andy Ling <Andy.Ling[AT]quantel.com>
Andy Ling <andy.ling[AT]s-a-m.com>
+Anil Kumar K K <anilkumar911[AT]gmail.com>
Anndy Ke <anndymaktub[AT]yahoo.com.tw>
Anthony Coddington <anthony.coddington[AT]endace.com>
Anton Thomasson <anton.thomasson[AT]ericsson.com>
@@ -4032,6 +4033,7 @@ Edwin Groothuis <edwin[AT]mavetju.org>
Eric Anderson <andersoe[AT]cs.cmu.edu>
Etienne Millon <etienne[AT]cryptosense.com>
Eugene Adell <eugene.adell[AT]d2-si.eu>
+Eugene Exarevsky <eugene.exarevsky[AT]dsr-company.com>
Eugene Sukhodolin <eugene[AT]sukhodolin.com>
Fabian Raetz <fabian.raetz[AT]gmail.com>
Fabrizio Demaria <fabrizio.demaria[AT]intel.com>
@@ -4077,6 +4079,7 @@ John A. Thacker <johnthacker[AT]gmail.com>
John Miner <optommp[AT]gmail.com>
Jonas Falkevik <jonas.falkevik[AT]gmail.com>
Jorge Power <jpower[AT]rsscorp.org>
+Jose Rubio <joserubiovidales[AT]gmail.com>
Josef Baumgartner <josef.baumgartner[AT]br-automation.com>
Joseph Huffman <jhuffman[AT]codeaurora.org>
Josip Medved <jmedved[AT]jmedved.com>
@@ -4212,6 +4215,7 @@ Stefan Völkel <sv[AT]its-v.de>
Stephan Kappertz <octopus.sk[AT]googlemail.com>
Stephane Bryant <stephane.ml.bryant[AT]gmail.com>
Stephen Donnelly <stephen.donnelly[AT]emulex.com>
+Sumit Kumar Jha <sjha3[AT]ncsu.edu>
Sunil Mushran <sunil.mushran[AT]oracle.com>
Sven Eckelmann <sven[AT]open-mesh.com>
Sven Schnelle <svens[AT]stackframe.org>
@@ -4254,14 +4258,10 @@ Yang Luo <hsluoyz[AT]qq.com>
Yann Lejeune <ylejeune[AT]netyl.org>
Yasuyuki Tanaka <yatch[AT]isl.rdc.toshiba.co.jp>
Zdeněk Žamberský <zzdevel[AT]seznam.cz>
-anilkumar911 <anilkumar911[AT]gmail.com>
anonsvn <anonsvn[AT]localhost>
cff339 <cff339[AT]gmail.com>
-clairvoyant <joserubiovidales[AT]gmail.com>
-dsrsupport <eugene.exarevsky[AT]dsr-company.com>
kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
-sjha3 <sjha3[AT]ncsu.edu>
Øyvind Rønningstad <ronningstad[AT]gmail.com>
Дмитрий Цветцих <dmitrycvet[AT]gmail.com>