From 7b21981cdb4f5d6c492edb2face8a8159dcc212e Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Fri, 12 Oct 2012 19:50:19 -0400
Subject: Autogenerate AUTHORS

AUTHORS.in tracks the maintainers, as well as some folks who were
previously in AUTHORS but don't have a git commit with proper
attribution.

Generated output is sorted alphabetically and lacks pretty spacing, so
tweak AUTHORS.in to follow the same format.

Additionally, drop the syntax-check rule that previously validated
AUTHORS against git log.
---
 .mailmap | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index 98ff6dc8d6..c430200ebe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,7 +3,6 @@
 # Email consolidation:
 # <Preferred address in AUTHORS> <other alias used by same author>
 
-<amy.griffis@hp.com> <aron.griffis@hp.com>
 <bozzolan@gmail.com> <redshift@gmx.com>
 <charles_duffy@messageone.com> <charles@dyfis.net>
 <dfj@redhat.com> <dfj@dfj.bne.redhat.com>
@@ -35,6 +34,8 @@
 <gerd@egidy.de> <gerd.von.egidy@intra2net.com>
 <benoar@dolka.fr> <benjamin.cama@telecom-bretagne.eu>
 <zhlcindy@linux.vnet.ibm.com> <zhlcindy@gmail.com>
+<serge.hallyn@canonical.com> <serue@us.ibm.com>
+<pritesh.kothari@sun.com> <Pritesh.Kothari@Sun.COM>
 
 # Name consolidation:
 # Preferred author spelling <preferred email>
@@ -43,3 +44,15 @@ Royce Lv <lvroyce@linux.vnet.ibm.com>
 Daniel J Walsh <dwalsh@redhat.com>
 Ján Tomko <jtomko@redhat.com>
 Gerd von Egidy <gerd@egidy.de>
+MATSUDA Daiki <matsudadik@intellilink.co.jp>
+Tang Chen <tangchen@cn.fujitsu.com>
+Peng Zhou <ailvpeng25@gmail.com>
+Dirk Herrendoerfer <d.herrendoerfer@herrendoerfer.name>
+Thibault VINCENT <thibault.vincent@smartjog.com>
+Aurelien Rougemont <beorn@binaries.fr>
+Serge E. Hallyn <serge.hallyn@canonical.com>
+Henrik Persson E <henrik.e.persson@ericsson.com>
+Philipp Hahn <hahn@univention.de>
+Marco Bozzolan <bozzolan@gmail.com>
+Marco Bozzolan <redshift@gmx.com>
+Pritesh Kothari <pritesh.kothari@sun.com>
-- 
cgit v1.2.1