X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=.mailmap;h=9ba28a151e83f9f4c56c0da2cd5083e1a3487ba5;hb=64695e53a0f425b831ba90d467f0e7a668c1b33c;hp=04b1c6cba820b6b76e0426ee08beb69fb9918b75;hpb=19c5f19d69bb5f520fa7213239490c55de06d99d;p=elogind.git

diff --git a/.mailmap b/.mailmap
index 04b1c6cba..9ba28a151 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,22 @@
-Kay Sievers <kay.sievers@vrfy.org> <kay.sievers@suse.de>
+Kay Sievers <kay@vrfy.org>
+Kay Sievers <kay@vrfy.org> <kay.sievers@vrfy.org>
+Kay Sievers <kay@vrfy.org> <kay.sievers@suse.de>
+Kay Sievers <kay@vrfy.org> <kay@pim.off.vrfy.org>
+Kay Sievers <kay@vrfy.org> <kay@pim>
+Greg KH <greg@kroah.com>
+Greg KH <greg@kroah.com> <greg@kroah.com>
+Greg KH <greg@kroah.com> <greg@press.(none)>
+Greg KH <greg@kroah.com> <gregkh@suse.de>
+Harald Hoyer <harald@redhat.com>
+David Zeuthen <david@fubar.dk>
+David Zeuthen <david@fubar.dk> <davidz@redhat.com>
+David Zeuthen <david@fubar.dk> <zeuthen@gmail.com>
+Hannes Reinecke <hare@suse.de>
+Scott James Remnant <scott@netsplit.com>
+Scott James Remnant <scott@netsplit.com>  <scott@ubuntu.com>
+Alan Jenkins <alan.christopher.jenkins@googlemail.com>
+Alan Jenkins <alan.christopher.jenkins@googlemail.com> <alan-jenkins@tuffmail.co.uk>
+Marco d'Itri <md@linux.it> <md@Linux.IT>
 Robert Gerus <ar@bash.org.pl> Robert "arachnist" Gerus <ar@bash.org.pl>
 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Zbyszek Szmek <zbyszek@in.waw.pl>
 Fabiano Fidêncio <fabianofidencio@gmail.com> Fabiano Fidencio <fidencio@profusion.mobi>