From: Eric Blake <eblake@redhat.com>
Date: Fri, 20 Mar 2015 12:16:01 +0000 (-0600)
Subject: maint: update .mailmap for recent contributions
X-Git-Tag: v1.2.14-rc1~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=feeaad4fd521598391a6fc2da17d4bff9e2485a3;p=thirdparty%2Flibvirt.git

maint: update .mailmap for recent contributions

Deepak Shetty has changed preferred email address since prior
contributions.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/.mailmap b/.mailmap
index 84a6dbea09..2f0fc901e6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,6 +7,8 @@
 <charles_duffy@messageone.com> <charles@dyfis.net>
 <claudio.bley@gmail.com> <cbley@av-test.de>
 <dfj@redhat.com> <dfj@dfj.bne.redhat.com>
+<dpkshetty@gmail.com> <deepakcs@linux.vnet.ibm.com>
+<dpkshetty@gmail.com> <deepakcs@redhat.com>
 <eblake@redhat.com> <ebb9@byu.net>
 <gdolley@arpnetworks.com> <gdolley@ucla.edu>
 <gerhard.stenzel@de.ibm.com> <gstenzel@linux.vnet.ibm.com>
@@ -58,3 +60,4 @@ Marco Bozzolan <bozzolan@gmail.com>
 Marco Bozzolan <redshift@gmx.com>
 Pritesh Kothari <pritesh.kothari@sun.com>
 Wang Yufei (James) <james.wangyufei@huawei.com>
+Deepak C Shetty <dpkshetty@gmail.com>