From 572fdd2ec93401259fb1441dbd9f5b2016847582 Mon Sep 17 00:00:00 2001
From: Zhongyue Luo <zhongyue.nah@intel.com>
Date: Tue, 11 Sep 2012 10:34:14 +0800
Subject: [PATCH] Create .mailmap file

Fixes bug #1048903

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

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

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..18221d4058
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
+Zhongyue Luo <zhongyue.nah@intel.com> <lzyeval@gmail.com>