Remove duplicate names from CREDITS

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

diff --git a/.mailmap b/.mailmap
index 8b27b94c575df3a98ba5b4ab90ed85c5e24c9aed..c068e74f2556395f81f887064eb7821cb1cfeeef 100644 (file)
--- 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 8741c33d60ae00ef767cda22366e4d43972203c0..a614b202fa60e33e4c611c4697d503d36ae4889b 100644 (file)
--- 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