summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorMichael Büsch <m@bues.ch>2011-07-04 20:50:05 +0200
committerJiri Kosina <jkosina@suse.cz>2011-07-07 15:18:01 +0200
commiteb032b9837a958e21ca000358a5bde5e17192ddb (patch)
tree880af47c607f37f134510a32e3499ce0365e0ef5 /.mailmap
parent8072ba1ba7fe9f48ad9f424829863214484dfc2f (diff)
downloadlinux-next-eb032b9837a958e21ca000358a5bde5e17192ddb.tar.gz
Update my e-mail address
Signed-off-by: Michael Buesch <m@bues.ch> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 1 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 353ad5607156..a4806f0de852 100644
--- a/.mailmap
+++ b/.mailmap
@@ -73,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>