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>
33Bhupesh Sharma <bhupesh.linux@gmail.com> <bhupesh.sharma@linaro.org>
34Bin Meng <bmeng.cn@gmail.com> <bin.meng@windriver.com>
35Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
36Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
37Christian Kohn <chris.kohn@amd.com> <christian.kohn@xilinx.com>
38Dirk Behme <dirk.behme@googlemail.com>
39Durga Challa <durga.challa@amd.com> <vnsl.durga.challa@xilinx.com>
40Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
41Fabio Estevam <fabio.estevam@nxp.com>
42Harini Katakam <harini.katakam@amd.com> <harini.katakam@xilinx.com>
43Harsha <harsha.harsha@amd.com> <harsha.harsha@xilinx.com>
44Heinrich Schuchardt <xypron.glpk@gmx.de> <heinrich.schuchardt@canonical.com>
45Heinrich Schuchardt <xypron.glpk@gmx.de> xypron.glpk@gmx.de <xypron.glpk@gmx.de>
46Ibai Erkiaga <ibai.erkiaga-elorza@amd.com> <ibai.erkiaga-elorza@xilinx.com>
47Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org>
48Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@toradex.com>
49Izhar Ameer Shaikh <izhar.ameer.shaikh@amd.com> <izhar.ameer.shaikh@xilinx.com>
50Jagan Teki <402jagan@gmail.com>
51Jagan Teki <jaganna@gmail.com>
52Jagan Teki <jaganna@xilinx.com>
53Jagan Teki <jagannadh.teki@gmail.com>
54Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
55Jay Buddhabhatti <jay.buddhabhatti@amd.com> <jay.buddhabhatti@xilinx.com>
56Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
57John Linn <john.linn@amd.com> <john.linn@xilinx.com>
58Jyotheeswar Reddy Mutthareddyvari <jyotheeswar.reddy.mutthareddyvari@amd.com> <jyothee@xilinx.com>
59Jyotheeswar Reddy Mutthareddyvari <jyotheeswar.reddy.mutthareddyvari@amd.com> <jyotheeswar.reddy.mutthareddyvari@xilinx.com>
60Kalyani Akula <kalyani.akula@amd.com> <kalyani.akula@xilinx.com>
61Masahisa Kojima <kojima.masahisa@socionext.com> <masahisa.kojima@linaro.org>
62Love Kumar <love.kumar@amd.com> <love.kumar@xilinx.com>
63Lukasz Majewski <lukma@denx.de>
64Marek Beh��n <kabel@kernel.org> <marek.behun@nic.cz>
65Marek Beh��n <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>
66Marek Vasut <marex@denx.de> <marek.vasut+renesas@gmail.com>
67Marek Vasut <marex@denx.de> <marek.vasut@gmail.com>
68Marek Vasut <marex@denx.de> <marex at denx.de>
69Markus Klotzbuecher <mk@denx.de>
70Masahiro Yamada <masahiroy@kernel.org> <yamada.masahiro@socionext.com>
71Masahiro Yamada <masahiroy@kernel.org> <yamada.m@jp.panasonic.com>
72Michal Simek <michal.simek@amd.com> <Monstr@seznam.cz>
73Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>
74Michal Simek <michal.simek@amd.com> <monstr@monstr.eu>
75Michal Simek <michal.simek@amd.com> <root@monstr.eu>
76Mirza <Taimoor_Mirza@mentor.com>
77Mounika Grace Akula <mounika.akula@amd.com> <mounika.grace.akula@xilinx.com>
78Mubin Usman Sayyed <mubin.sayyed@amd.com> <mubin.usman.sayyed@xilinx.com>
79Nathalie Chan King Choy <nathalie.chan-king-choy@amd.com> <nathalie.chan-king-choy@xilinx.com>
80Nathalie Chan King Choy <nathalie.chan-king-choy@amd.com> <nathalie@xilinx.com>
81Nava kishore Manne <nava.kishore.manne@amd.com> <nava.manne@xilinx.com>
82Neal Frager <neal.frager@amd.com> <neal.frager@xilinx.com>
83Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
84Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
85This contributor prefers not to receive mails <noreply@example.com> <pali@kernel.org>
86This contributor prefers not to receive mails <noreply@example.com> <pali.rohar@gmail.com>
87Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com>
88Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com>
89Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
90Piyush Mehta <piyush.mehta@amd.com> <piyush.mehta@xilinx.com>
91Prabhakar Kushwaha <prabhakar@freescale.com>
92Punnaiah Choudary Kalluri <punnaiah.choudary.kalluri@amd.com> <punnaiah.choudary.kalluri@xilinx.com>
93Radhey Shyam Pandey <radhey.shyam.pandey@amd.com> <radhey.shyam.pandey@xilinx.com>
94Rajeshwari Shinde <rajeshwari.s@samsung.com>
95Raju Kumar Pothuraju <rajukumar.pothuraju@amd.com> <raju.kumar-pothuraju@xilinx.com>
96Ravi Patel <ravi.patel@amd.com> <ravi.patel@xilinx.com>
97Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@gmail.com>
98Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@uam.es>
99Rohit Visavalia <rohit.visavalia@amd.com> <rohit.visavalia@xilinx.com>
100Ruchika Gupta <ruchika.gupta@nxp.com> <ruchika.gupta@freescale.com>
101Saeed Nowshadi <saeed.nowshadi@amd.com> <saeed.nowshadi@xilinx.com>
102Sai Krishna Potthuri <sai.krishna.potthuri@amd.com> <lakshmi.sai.krishna.potthuri@xilinx.com>
103Sai Pavan Boddu <sai.pavan.boddu@amd.com> <sai.pavan.boddu@xilinx.com>
104Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> <sandeep.gundlupet-raju@xilinx.com>
105Sandeep Paulraj <s-paulraj@ti.com>
106Sandeep Reddy Ghanapuram <sandeep.reddy-ghanapuram@amd.com> <sandeep.reddy-ghanapuram@xilinx.com>
107Shaohui Xie <Shaohui.Xie@freescale.com>
108Shravya Kumbham <shravya.kumbham@amd.com> <shravya.kumbham@xilinx.com>
109Shubhrajyoti Datta <shubhrajyoti.datta@amd.com> <shubhrajyoti.datta@xilinx.com>
110Siva Durga Prasad Paladugu <siva.durga.prasad.paladugu@amd.com> <siva.durga.paladugu@xilinx.com>
111Siva Durga Prasad Paladugu <siva.durga.prasad.paladugu@amd.com> <sivadur@xilinx.com>
112Srinivas Goud <srinivas.goud@amd.com> <srinivas.goud@xilinx.com>
113Srinivas Neeli <srinivas.neeli@amd.com> <srinivas.neeli@xilinx.com>
114Stefan Roese <sr@denx.de> <stroese>
115Stefano Babic <sbabic@denx.de>
116Stefano Stabellini <stefano.stabellini@amd.com> <stefano.stabellini@xilinx.com>
117Tom Rini <trini@konsulko.com> <trini@ti.com>
118Tomas Thoresen <tomas.thoresen@amd.com> <tomast@xilinx.com>
119TsiChung Liew <Tsi-Chung.Liew@freescale.com>
120Varalaxmi Bingi <varalaxmi.bingi@amd.com> <varalaxmi.bingi@xilinx.com>
121Venkatesh Yadav Abbarapu <venkatesh.abbarapu@amd.com> <venkatesh.abbarapu@xilinx.com>
122Vikhyat Goyal <vikhyat.goyal@amd.com> <vikhyat.goyal@xilinx.com>
123Vishal Patel <vishal.patel@amd.com> <vishal.patel@xilinx.com>
124Wolfgang Denk <wd@denx.de> <wd@atlas.denx.de>
125Wolfgang Denk <wd@denx.de> <wd@castor.denx.de>
126Wolfgang Denk <wd@denx.de> <wd@fifi.denx.de>
127Wolfgang Denk <wd@denx.de> <wd@nyx.(none)>
128Wolfgang Denk <wd@denx.de> <wd@nyx.denx.de>
129Wolfgang Denk <wd@denx.de> <wd@pollux.(none)>
130Wolfgang Denk <wd@denx.de> <wd@pollux.denx.de>
131Wolfgang Denk <wd@denx.de> <wd@xpert.denx.de>
132Wolfgang Denk <wd@denx.de> <wdenk>
133York Sun <york.sun@nxp.com>
134York Sun <yorksun@freescale.com>
135��ukasz Majewski <l.majewski@samsung.com>
136