1#
2# This list is used by git-shortlog to fix a few botched name translations
3# in the git archive, either because the author's full name was messed up
4# and/or not always written the same way, making contributions from the
5# same person appearing not to be so or badly displayed.
6#
7# This file is also used by scripts/get_maintainer.pl.
8#
9# This file can be modified by hand or updated by the following command:
10#  scripts/mailmapper > tmp; mv tmp .mailmap
11#
12# Entries in this file take one of the following forms:
13# Proper Name <commit@email.xx>
14# <proper@email.xx> <commit@email.xx>
15# Proper Name <proper@email.xx> <commit@email.xx>
16# Proper Name <proper@email.xx> Commit Name <commit@email.xx>
17
18Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
19Allen Martin <amartin@nvidia.com>
20Amanda Baze <amanda.baze@amd.com> <nicole.baze@xilinx.com>
21Amit Kumar Mahapatra <amit.kumar-mahapatra@amd.com> <amit.kumar-mahapatra@xilinx.com>
22Andreas Bießmann <andreas.devel@googlemail.com>
23Andreas Bießmann <andreas@biessmann.org>
24Aneesh V <aneesh@ti.com>
25Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>
26Anurag Kumar Vulisha <AnuragKumar.Vulisha@amd.com> <anurag.kumar.vulisha@xilinx.com>
27Appana Durga Kedareswara rao <appana.durga.kedareswara.rao@amd.com> <appana.durga.rao@xilinx.com>
28Ashok Reddy Soma <ashok.reddy.soma@amd.com> <ashok.reddy.soma@xilinx.com>
29Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>
30Bharat Kumar Gogada <bharat.kumar.gogada@amd.com> <bharat.kumar.gogada@xilinx.com>
31Bharat Kumar Gogada <bharat.kumar.gogada@amd.com> <bharatku@xilinx.com>
32Bhargava Sreekantappa Gayathri <bhargava.sreekantappa-gayathri@amd.com> <bhargava.sreekantappa-gayathri@xilinx.com>
33Bin Meng <bmeng.cn@gmail.com> <bin.meng@windriver.com>
34Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
35Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
36Christian Kohn <chris.kohn@amd.com> <christian.kohn@xilinx.com>
37Dirk Behme <dirk.behme@googlemail.com>
38Durga Challa <durga.challa@amd.com> <vnsl.durga.challa@xilinx.com>
39Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
40Fabio Estevam <fabio.estevam@nxp.com>
41Harini Katakam <harini.katakam@amd.com> <harini.katakam@xilinx.com>
42Harsha <harsha.harsha@amd.com> <harsha.harsha@xilinx.com>
43Heinrich Schuchardt <xypron.glpk@gmx.de> <heinrich.schuchardt@canonical.com>
44Heinrich Schuchardt <xypron.glpk@gmx.de> xypron.glpk@gmx.de <xypron.glpk@gmx.de>
45Ibai Erkiaga <ibai.erkiaga-elorza@amd.com> <ibai.erkiaga-elorza@xilinx.com>
46Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org>
47Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@toradex.com>
48Izhar Ameer Shaikh <izhar.ameer.shaikh@amd.com> <izhar.ameer.shaikh@xilinx.com>
49Jagan Teki <402jagan@gmail.com>
50Jagan Teki <jaganna@gmail.com>
51Jagan Teki <jaganna@xilinx.com>
52Jagan Teki <jagannadh.teki@gmail.com>
53Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
54Jay Buddhabhatti <jay.buddhabhatti@amd.com> <jay.buddhabhatti@xilinx.com>
55Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
56John Linn <john.linn@amd.com> <john.linn@xilinx.com>
57Jyotheeswar Reddy Mutthareddyvari <jyotheeswar.reddy.mutthareddyvari@amd.com> <jyothee@xilinx.com>
58Jyotheeswar Reddy Mutthareddyvari <jyotheeswar.reddy.mutthareddyvari@amd.com> <jyotheeswar.reddy.mutthareddyvari@xilinx.com>
59Kalyani Akula <kalyani.akula@amd.com> <kalyani.akula@xilinx.com>
60Love Kumar <love.kumar@amd.com> <love.kumar@xilinx.com>
61Lukasz Majewski <lukma@denx.de>
62Marek Behún <kabel@kernel.org> <marek.behun@nic.cz>
63Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>
64Marek Vasut <marex@denx.de> <marek.vasut+renesas@gmail.com>
65Marek Vasut <marex@denx.de> <marek.vasut@gmail.com>
66Marek Vasut <marex@denx.de> <marex at denx.de>
67Markus Klotzbuecher <mk@denx.de>
68Masahiro Yamada <yamada.masahiro@socionext.com> <masahiroy@kernel.org>
69Masahiro Yamada <yamada.masahiro@socionext.com> <yamada.m@jp.panasonic.com>
70Michal Simek <michal.simek@amd.com> <Monstr@seznam.cz>
71Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>
72Michal Simek <michal.simek@amd.com> <monstr@monstr.eu>
73Michal Simek <michal.simek@amd.com> <root@monstr.eu>
74Mirza <Taimoor_Mirza@mentor.com>
75Mounika Grace Akula <mounika.akula@amd.com> <mounika.grace.akula@xilinx.com>
76Mubin Usman Sayyed <mubin.sayyed@amd.com> <mubin.usman.sayyed@xilinx.com>
77Nathalie Chan King Choy <nathalie.chan-king-choy@amd.com> <nathalie.chan-king-choy@xilinx.com>
78Nathalie Chan King Choy <nathalie.chan-king-choy@amd.com> <nathalie@xilinx.com>
79Nava kishore Manne <nava.kishore.manne@amd.com> <nava.manne@xilinx.com>
80Neal Frager <neal.frager@amd.com> <neal.frager@xilinx.com>
81Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
82Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
83Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com>
84Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com>
85Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
86Piyush Mehta <piyush.mehta@amd.com> <piyush.mehta@xilinx.com>
87Prabhakar Kushwaha <prabhakar@freescale.com>
88Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@amd.com> <punnaiah.choudary.kalluri@xilinx.com>
89Radhey Shyam Pandey <radhey.shyam.pandey@amd.com> <radhey.shyam.pandey@xilinx.com>
90Rajeshwari Shinde <rajeshwari.s@samsung.com>
91Raju Kumar Pothuraju <rajukumar.pothuraju@amd.com> <raju.kumar-pothuraju@xilinx.com>
92Ravi Patel <ravi.patel@amd.com> <ravi.patel@xilinx.com>
93Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@gmail.com>
94Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@uam.es>
95Rohit Visavalia <rohit.visavalia@amd.com> <rohit.visavalia@xilinx.com>
96Ruchika Gupta <ruchika.gupta@nxp.com> <ruchika.gupta@freescale.com>
97Saeed Nowshadi <saeed.nowshadi@amd.com> <saeed.nowshadi@xilinx.com>
98Sai Krishna Potthuri <sai.krishna.potthuri@amd.com> <lakshmi.sai.krishna.potthuri@xilinx.com>
99Sai Pavan Boddu <sai.pavan.boddu@amd.com> <sai.pavan.boddu@xilinx.com>
100Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> <sandeep.gundlupet-raju@xilinx.com>
101Sandeep Paulraj <s-paulraj@ti.com>
102Sandeep Reddy Ghanapuram <sandeep.reddy-ghanapuram@amd.com> <sandeep.reddy-ghanapuram@xilinx.com>
103Shaohui Xie <Shaohui.Xie@freescale.com>
104Shravya Kumbham <shravya.kumbham@amd.com> <shravya.kumbham@xilinx.com>
105Shubhrajyoti Datta <shubhrajyoti.datta@amd.com> <shubhrajyoti.datta@xilinx.com>
106Siva Durga Prasad Paladugu <siva.durga.prasad.paladugu@amd.com> <siva.durga.paladugu@xilinx.com>
107Siva Durga Prasad Paladugu <siva.durga.prasad.paladugu@amd.com> <sivadur@xilinx.com>
108Srinivas Goud <srinivas.goud@amd.com> <srinivas.goud@xilinx.com>
109Srinivas Neeli <srinivas.neeli@amd.com> <srinivas.neeli@xilinx.com>
110Stefan Roese <sr@denx.de> <stroese>
111Stefano Babic <sbabic@denx.de>
112Stefano Stabellini <stefano.stabellini@amd.com> <stefano.stabellini@xilinx.com>
113Tom Rini <trini@konsulko.com> <trini@ti.com>
114Tomas Thoresen <tomas.thoresen@amd.com> <tomast@xilinx.com>
115TsiChung Liew <Tsi-Chung.Liew@freescale.com>
116Varalaxmi Bingi <varalaxmi.bingi@amd.com> <varalaxmi.bingi@xilinx.com>
117Venkatesh Yadav Abbarapu <venkatesh.abbarapu@amd.com> <venkatesh.abbarapu@xilinx.com>
118Vikhyat Goyal <vikhyat.goyal@amd.com> <vikhyat.goyal@xilinx.com>
119Vishal Patel <vishal.patel@amd.com> <vishal.patel@xilinx.com>
120Wolfgang Denk <wd@denx.de> <wd@atlas.denx.de>
121Wolfgang Denk <wd@denx.de> <wd@castor.denx.de>
122Wolfgang Denk <wd@denx.de> <wd@fifi.denx.de>
123Wolfgang Denk <wd@denx.de> <wd@nyx.(none)>
124Wolfgang Denk <wd@denx.de> <wd@nyx.denx.de>
125Wolfgang Denk <wd@denx.de> <wd@pollux.(none)>
126Wolfgang Denk <wd@denx.de> <wd@pollux.denx.de>
127Wolfgang Denk <wd@denx.de> <wd@xpert.denx.de>
128Wolfgang Denk <wd@denx.de> <wdenk>
129York Sun <york.sun@nxp.com>
130York Sun <yorksun@freescale.com>
131Łukasz Majewski <l.majewski@samsung.com>
132