X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=.mailmap;h=a4806f0de852079a2b2d093c30ba05d478df7ec5;hb=c6c539f023423a7a730f5759be1b3b45c2d1d1ca;hp=5a6dd592eedc888090d43bb8299b1ddc2143ce08;hpb=712673339a0d085358fd1cd3a6477cc7979bb69f;p=~andy%2Flinux

diff --git a/.mailmap b/.mailmap
index 5a6dd592eed..a4806f0de85 100644
--- a/.mailmap
+++ b/.mailmap
@@ -32,6 +32,7 @@ Brian Avery <b.avery@hp.com>
 Brian King <brking@us.ibm.com>
 Christoph Hellwig <hch@lst.de>
 Corey Minyard <minyard@acm.org>
+Damian Hobson-Garcia <dhobsong@igel.co.jp>
 David Brownell <david-b@pacbell.net>
 David Woodhouse <dwmw2@shinybook.infradead.org>
 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
@@ -72,8 +73,7 @@ Linas Vepstas <linas@austin.ibm.com>
 Mark Brown <broonie@sirena.org.uk>
 Matthieu CASTET <castet.matthieu@free.fr>
 Mayuresh Janorkar <mayur@ti.com>
-Michael Buesch <mb@bu3sch.de>
-Michael Buesch <mbuesch@freenet.de>
+Michael Buesch <m@bues.ch>
 Michel Dänzer <michel@tungstengraphics.com>
 Mitesh shah <mshah@teja.com>
 Morten Welinder <terra@gnome.org>