Remove duplicate names from CREDITS
* .mailmap: Merge email addresses.
* CREDITS.in: Remove a duplicate name.
diff --git a/.mailmap b/.mailmap
index 8b27b94..c068e74 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 8741c33..a614b20 100644
--- a/CREDITS.in
+++ b/CREDITS.in
@@ -19,7 +19,6 @@
##>
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