summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-12-11 15:07:44 -0500
committerTom Rini <trini@konsulko.com>2015-12-11 15:07:44 -0500
commit5076c64a08d2083af5a7761b12a30116ef0da967 (patch)
tree08953f1cd25ed155eb819162eb495f0153c3edd5 /.mailmap
parentf7a5f025ba0bc405e321df4dd55b73a7995ba527 (diff)
parent76de51a6da0411e1f3e80e1c9a2ef5bfa8e35571 (diff)
downloadu-boot-imx-5076c64a08d2083af5a7761b12a30116ef0da967.zip
u-boot-imx-5076c64a08d2083af5a7761b12a30116ef0da967.tar.gz
u-boot-imx-5076c64a08d2083af5a7761b12a30116ef0da967.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap6
1 files changed, 5 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index e1c6663..2f32fe8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,7 +13,11 @@ Andreas Bießmann <andreas.devel@googlemail.com>
Aneesh V <aneesh@ti.com>
Dirk Behme <dirk.behme@googlemail.com>
Fabio Estevam <fabio.estevam@freescale.com>
-Jagannadha Sutradharudu Teki <402jagan@gmail.com>
+Jagan Teki <402jagan@gmail.com>
+Jagan Teki <jaganna@gmail.com>
+Jagan Teki <jaganna@xilinx.com>
+Jagan Teki <jagannadh.teki@gmail.com>
+Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
Markus Klotzbuecher <mk@denx.de>
Prabhakar Kushwaha <prabhakar@freescale.com>
Rajeshwari Shinde <rajeshwari.s@samsung.com>