summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2015-11-02 11:54:19 -0500
committerAnas Nashif <anas.nashif@intel.com>2016-02-05 20:24:37 -0500
commit4e93f0804b4b18e4cadb6d33edf157b43a4ba64f (patch)
treeb801a89343e9d98918db3bc77605c71f557c0b48
parent2ad03b930d5a9e9a521e88fbb73c1c05db4a3289 (diff)
Update .mailmap
Change-Id: I22c920e52c4b36ec544a2521fe03e4ef11933875 Signed-off-by: Anas Nashif <anas.nashif@intel.com>
-rw-r--r--.mailmap6
1 files changed, 6 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index bd12a43e8..e14a46294 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1 +1,7 @@
Dirk Brandewie <dirk.j.brandewie@intel.com> <dirk.j.brandewie@intel.com>
+Mike Hirst <michael.hirst@windriver.com> <michael.hirst@windriver.com>
+Johan Kruger <johan.kruger@windriver.com> <johan.kruger@windriver.com>
+Leona Cook <leonax.cook@intel.com> <lsc@hackeress.com>
+Leona Cook <leonax.cook@intel.com> <leonax.cook@intel.com>
+Thomas Heeley <thomas.heeley@intel.com> <thomas.heeley@intel.com>
+Shuang He <shuang.he@intel.com> <shuang.he@intel.com>