summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2016-05-17 17:51:44 +0200
committerStefano Babic <sbabic@denx.de>2016-05-17 17:51:44 +0200
commit52b1eaf93d6b55e1467f97b8eefdc2f8b6031c43 (patch)
tree73357539a8382b406c29b1826dc17012f267f2cb /.mailmap
parentaaeadd3f7b248aeb1c72c36183ab9c6e77da6ce2 (diff)
parentaeaec0e682f45b9e0c62c522fafea353931f73ed (diff)
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 5ea9f93fcf..14b5ad7e5c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,6 +10,7 @@
Allen Martin <amartin@nvidia.com>
Andreas Bießmann <andreas.devel@googlemail.com>
+Andreas Bießmann <andreas@biessmann.org>
Aneesh V <aneesh@ti.com>
Dirk Behme <dirk.behme@googlemail.com>
Fabio Estevam <fabio.estevam@nxp.com>