X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=.mailmap;h=d46c166cf9192e6868db60cf73e45505d0f1cfe2;hp=da8ca84438b94e2f8fd7142ac8e719895ae72d27;hb=734744fddd783fec7b19215b24c12e95c00c1e67;hpb=0790b9fed42eefc4e22dbbe2337cba9713b7848c

diff --git a/.mailmap b/.mailmap
index da8ca8443..d46c166cf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,10 +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>
+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>
@@ -18,7 +21,6 @@ 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>
 Martin Pitt <martinpitt@gnome.org>
 Martin Pitt <martinpitt@gnome.org> <martin.pitt@ubuntu.com>
@@ -36,10 +38,67 @@ 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>
 William Jon McCann <jmccann@redhat.com> <william.jon.mccann@gmail.com>
 Yin Kangkai <kangkai.yin@intel.com> <kangkai.yin@linux.intel.com>
 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
+Lennart Poettering <lennart@poettering.net> <lennart@bf9bc1cc-28ce-0310-abfb-9041aa761afb>
+Ananth N Mavinakayanahalli <ananth@in.ibm.com>
+Ananth N Mavinakayanahalli <ananth@in.ibm.com> <ananthmg@rediffmail.com>
+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>
+Andreas Henriksson <andreas@fatal.se>
+Daniel Rusek <mail@asciiwolf.com>
+Dennis Wassenberg <dennis.wassenberg@secunet.com>
+Reid Price <reid.price@gmail.com>
+Stefan Schweter <stefan@schweter.it>
+Seraphime Kirkovski <kirkseraph@gmail.com>
+Bart Rulon <barron@lexmark.com>
+Richard W.M. Jones <rjones@redhat.com>
+Roman Stingler <coolx67@gmx.at>
+Michael Hoy <rimmington@gmail.com>
+Tiago Levit <liamgliam@gmail.com>
+Eric Cook <llua@users.noreply.github.com>
+Lukáš Nykrýn <lnykryn@redhat.com>
+Heikki Kemppainen <heikki.kemppainen@nokia.com>
+Hendrik Brueckner <hbrueckner@users.noreply.github.com>
+Alexandros Frantzis <alexandros.frantzis@canonical.com>
+Alexander Kochetkov <al.kochet@gmail.com>
+Fionn Cleary <clearyf@tcd.ie>
+Michel Kraus <github@demonsphere.de> <27o@users.noreply.github.com>
+Charles (Chas) Williams <ciwillia@brocade.com>
+Emil Soleyman <emil@soleyman.com>
+Dmitry Khlebnikov <dmitry.khlebnikov@rea-group.com> <galaxy4public@users.noreply.github.com>
+Antoine Eiche <lewo@abesis.fr>
+Gianluca Boiano <morf3089@gmail.com>
+Paolo Giangrandi <paolo@luccalug.it>
+Karl Kraus <karl.kraus@tum.de> <laqueray@gmail.com>
+Tibor Nagy <xnagytibor@gmail.com>
+Stuart McLaren <stuart.mclaren@hp.com>