| commit | f3ae370a36c2103ce994865f5c3713377a9d0ae9 | [log] [tgz] |
|---|---|---|
| author | Edward O'Callaghan <funfunctor@folklore1984.net> | Wed Jun 22 20:42:30 2016 +1000 |
| committer | Marek Olšák <marek.olsak@amd.com> | Thu Jun 23 00:00:46 2016 +0200 |
| tree | e4df5ce4cdb436d25dbd579e35ddf93849949d21 | |
| parent | 22304554a2e0669d38cc5de415c84bd1cccf6a94 [diff] [blame] |
.mailmap: Fixup my email address Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net>
diff --git a/.mailmap b/.mailmap index c614dec..9c476c3 100644 --- a/.mailmap +++ b/.mailmap
@@ -138,6 +138,8 @@ Dylan Baker <dylanx.c.baker@intel.com> <baker.dylan.c@gmail.com> +Edward O'Callaghan <funfunctor@folklore1984.net> <eocallaghan@alterapraxis.com> + Emeric Grange <emeric.grange@gmail.com> Emeric <emeric.grange@gmail.com> Emil Velikov <emil.l.velikov@gmail.com> <emil.velikov@collabora.com>