From 409b20b4613024a4786953b6940ccfd161f7b016 Mon Sep 17 00:00:00 2001
From: Joe Gordon <joe.gordon0@gmail.com>
Date: Mon, 28 Oct 2013 10:16:35 +0000
Subject: [PATCH] Add mailmap file

The .mailmap feature is used to coalesce together commits by the same
person in the shortlog, where their name and/or email address was
spelled differently.
http://git-scm.com/docs/git-shortlog

Change-Id: I9260d12fe52b31feae362995641e94969ea6bbbb
---
 .mailmap | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..516ae6fe01
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>