maint: use mailmap, not AUTHORS, for secondary addresses

* AUTHORS: Move Stefan's second entry...
* .mailmap: ...here.

diff --git a/.mailmap b/.mailmap
index 56d509268678d3239631483968aa884ad4bd039a..720afaa96704df8d514e40cfb2d15f34671575ee 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -27,6 +27,7 @@
 <marcandre.lureau@redhat.com> <marcandre.lureau@gmail.com>
 <supriyak@linux.vnet.ibm.com> <supriyak@in.ibm.com>
 <neil@aldur.co.uk> <neil@brightbox.co.uk>
+<stefanb@us.ibm.com> <stefanb@linux.vnet.ibm.com>
 
 # Name consolidation:
 # Preferred author spelling <preferred email>

diff --git a/AUTHORS b/AUTHORS
index 19fac4281c8ae79e256accc06cff1cff5545e21a..f6c2df45c54ca8420f395ab15468d38d2ab22e53 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -203,7 +203,6 @@ Patches have also been contributed by:
   Josh Durgin          <josh.durgin@dreamhost.com>
   Wen Ruo Lv           <lvroyce@linux.vnet.ibm.com>
   Patrice LACHANCE     <patlachance@gmail.com>
-  Stefan Berger        <stefanb@linux.vnet.ibm.com>
 
   [....send patches to get your name here....]