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

diff --git a/.mailmap b/.mailmap
index da8ca8443..ddaf4d570 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,6 +7,7 @@ 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>
 Harald Hoyer <harald@redhat.com>
 David Zeuthen <david@fubar.dk>
 David Zeuthen <david@fubar.dk> <davidz@redhat.com>
@@ -18,7 +19,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>
@@ -43,3 +43,20 @@ 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>
+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>