From: Yann Dupont <yann@objoo.org>
Date: Mon, 8 Feb 2016 23:31:09 +0000 (+0100)
Subject: mailmap: Matt Benjamin affiliation
X-Git-Tag: v10.1.0~393^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7528%2Fhead;p=ceph.git

mailmap: Matt Benjamin affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
---

diff --git a/.mailmap b/.mailmap
index a8e05faf1c90..ab1228502dc3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -181,6 +181,7 @@ Marcel Lauhoff <lauhoff@uni-mainz.de> <ml@irq0.org>
 Marco Garcês <marco.garces@bci.co.mz> <marco@garces.cc>
 Mark Nelson <mnelson@redhat.com> <mark.a.nelson@gmail.com>
 Matt Benjamin <matt@cohortfs.com> <matt@linuxbox.com>
+Matt Benjamin <mbenjamin@redhat.com> <mbenjami@redhat.com>
 Matthew Roy <matthew@royhousehold.net> <matthew@matthew-ubuntu.(none)>
 Matthew Roy <matthew@royhousehold.net> <mroy@sandbox-ed.com>
 Matthew Wodrich <matthew.wodrich@dreamhost.com> <mattheww@Mattsbox.(none)>