From 66091df82f872c355bc66a98eaac9482cc8c4af3 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Mon, 6 Jan 2014 11:05:10 +0100
Subject: [PATCH] Add .mailmap

The mailmap file is used when generating the AUTHORS file
and allows to merge entries by AUTHORS with several email
addresses into one canonical entry.

Added content to .mailmap to merge two addresses of
Ying Chun Guo

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

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..66e8aae0
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
+<guoyingc@cn.ibm.com> <daisy.ycguo@gmail.com>