commit 6ff2011b96d684b653b0fe91a84348f96d2771ec
author Johan Hedberg <johan.hedberg@intel.com> Sun Aug 07 10:01:34 2016 +0300
committer Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> Mon Aug 08 21:24:49 2016 +0000
tree 80709a6f4903e654fe4fc26913201731ba82a8fd
parent 5bf86797197217354ae159be056913819d38688e

mailmap: Fix broken author information for Evan Couzens

Once again, broken commits have been merged with incorrect author
information. Fix this in .mailmap.

Before this patch (git shortlog):

viggo.jf.intel.com (2):
      doc: Move code contribution info to wiki.
      doc: Move code conventions to Zephyr wiki.

After the patch:

Evan Couzens (2):
      doc: Move code contribution info to wiki.
      doc: Move code conventions to Zephyr wiki.

Change-Id: I382c06b49fdc5f6c81bc9ec952c5958b4e1ca144
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

.mailmap

diff --git a/.mailmap b/.mailmap
index 0ca0cc1..ce686a9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,3 +11,4 @@
 Carles Cufi <carles.cufi@nordicsemi.no> <carles.cufi@nordicsemi.no>
 Kuo-Lang Tseng <kuo-lang.tseng@intel.com> <kuo-lang.tseng@intel.com>
 Gerardo Aceves <gerardo.aceves@intel.com> <gerardo.aceves@intel.com>
+Evan Couzens <evanx.couzens@intel.com> <evanx.couzens@intel.com>