From: Dmitry V. Levin <ldv@altlinux.org>
Date: Tue, 1 May 2012 21:51:38 +0000 (+0000)
Subject: Remove duplicate names from CREDITS
X-Git-Tag: v4.7~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e263e3b8131ad9d60c0e91d1307ae16437bc2c06;p=strace

Remove duplicate names from CREDITS

* .mailmap: Merge email addresses.
* CREDITS.in: Remove a duplicate name.
---

diff --git a/.mailmap b/.mailmap
index 8b27b94c..c068e74f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,6 @@
 # Map git author names and email addresses to canonical/preferred form.
+<ak@linux.intel.com>	<ak@suse.de>
 <holger@freyther.de>	<zecke@selfish.org>
 <schwab@linux-m68k.org>	<schwab@redhat.com>
 <schwab@linux-m68k.org>	<schwab@suse.de>
+<vda.linux@googlemail.com>	<dvlasenk@redhat.com>
diff --git a/CREDITS.in b/CREDITS.in
index 8741c33d..a614b202 100644
--- a/CREDITS.in
+++ b/CREDITS.in
@@ -19,7 +19,6 @@ strace-devel@lists.sourceforge.net mailing list.
 ##>
 Aaron Ucko                      ucko@vax1.rockhurst.edu
 Adrien Kunysz                   adrien@kunysz.be
-Andi Kleen                      ak@suse.de
 Anton Blanchard                 anton@samba.org
 Arkadiusz Miskiewicz            misiek@pld.org.pl
 Bai Weidong                     baiwd@cn.fujitsu.com