X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=.mailmap;h=d56fb6784526798a9d141919ac25aa2c981a8b60;hp=12fb2c8e603f976738136b07eff21160bd14068c;hb=c44dff35969ac35ad0ff9028658614d94a54ae22;hpb=89db26a263480ccacfdad039063151ecb9a74f41

diff --git a/.mailmap b/.mailmap
index 12fb2c8e6..d56fb6784 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,11 +3,13 @@ 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>
-Greg KH <greg@kroah.com> <greg@bucket.kroah.org>
+Kay Sievers <kay@vrfy.org> <kay@yik.fritz.box>
+Greg Kroah-Hartman <greg@kroah.com>
+Greg Kroah-Hartman <greg@kroah.com> <greg@kroah.com>
+Greg Kroah-Hartman <greg@kroah.com> <greg@press.(none)>
+Greg Kroah-Hartman <greg@kroah.com> <gregkh@suse.de>
+Greg Kroah-Hartman <greg@kroah.com> <greg@bucket.kroah.org>
+Greg Kroah-Hartman <greg@kroah.com> <gregkh@linuxfoundation.org>
 Harald Hoyer <harald@redhat.com>
 David Zeuthen <david@fubar.dk>
 David Zeuthen <david@fubar.dk> <davidz@redhat.com>
@@ -36,7 +38,7 @@ Michal Soltys <soltys@ziu.info> <nozo@ziu.info>
 Piter PUNK <piterpunk@slackware.com> <piterpk@terra.com.br>
 Richard Hughes <richard@hughsie.com> <hughsient@gmail.com>
 Robby Workman <rw@rlworkman.net> <rworkman@slackware.com>
-Shawn Landden <shawnlandden@gmail.com>
+Shawn Landden <shawnlandden@gmail.com> <shawn@churchofgit.com>
 Simon Peeters <peeters.simon@gmail.com>
 Tobias Klauser <tklauser@distanz.ch> <tklauser@nuerscht.ch>
 Miklos Vajna <vmiklos@frugalware.org> <vmiklos@gmail.com>
@@ -50,3 +52,25 @@ Ted Ts'o <tytso@mit.edu>
 Tobias Klauser <tklauser@access.unizh.ch>
 Tobias Klauser <tklauser@access.unizh.ch> <tklauser@access.unizh.chbk>
 Tobias Klauser <tklauser@access.unizh.ch> <klauser@access.unizh.ch>
+Tobias Klauser <tklauser@access.unizh.ch> <tklauser@distanz.ch>
+Patrick Mansfield <patmans@us.ibm.com>
+Christophe Varoqui <christophe.varoqui@free.fr>
+Daniel Stekloff <dsteklof@us.ibm.com>
+Michael Buesch <mbuesch@freenet.de>
+Olaf Hering <olh@suse.de>
+Robert Love <rml@tech9.net>
+Arnd Bergmann <arnd@arndb.de>
+Tom Rini <trini@kernel.crashing.org>
+Paul Mundt <lethal@linux-sh.org>
+Atul Sabharwal <atul.sabharwal@intel.com>
+Daniel Machon <Danielmachon@live.dk>
+Thomas Blume <Thomas.Blume@suse.com>
+Pablo Lezaeta Reyes <prflr88@gmail.com>
+Otto Wallenius <otto_026@hotmail.com>
+Tom Yan <tom.ty89@gmail.com>
+Marty Plummer <ntzrmtthihu777@gmail.com>
+Brian Boylston <brian.boylston@hpe.com>
+Thomas H. P. Andersen <phomes@gmail.com>
+Michael Olbrich <m.olbrich@pengutronix.de>
+Douglas Christman <DouglasChristman@gmail.com>
+Alexander Kuleshov <kuleshovmail@gmail.com> <0xAX@users.noreply.github.com>