From 09d20513e96fe42a2ed8bc15c22bdc5764de2e1b Mon Sep 17 00:00:00 2001
From: Jiajun Liu <jiajun@unitedstack.com>
Date: Thu, 23 May 2013 09:12:04 +0000
Subject: [PATCH] Create .mailmap file

Use .mailmap file to coalesce commits
by the same person using multiple names and/or email addresses

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

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..d5ad780b38
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
+Jiajun Liu <jiajun@unitedstack.com> <iamljj@gmail.com>