X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=.mailmap;h=8acce4b2bfe4c49f78a9ff697b291043f9ff431c;hb=64531496f990c2a63211c72b953dfc084b4c2589;hp=f27f366bcb50e24e92e6ea1a069cf21c4c92f2a4;hpb=2996b6405e9522082b53ded0392438830ad6c43a;p=platform%2Fkernel%2Fu-boot.git

diff --git a/.mailmap b/.mailmap
index f27f366..8acce4b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -49,6 +49,7 @@ Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>
 Michal Simek <michal.simek@xilinx.com> <monstr@monstr.eu>
 Michal Simek <michal.simek@xilinx.com> <Monstr@seznam.cz>
 Michal Simek <michal.simek@xilinx.com> <root@monstr.eu>
+Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
 Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
 Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com>
 Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com>