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>
20Andreas Bießmann <andreas.devel@googlemail.com>
21Andreas Bießmann <andreas@biessmann.org>
22Aneesh V <aneesh@ti.com>
23Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
24Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
25Dirk Behme <dirk.behme@googlemail.com>
26Fabio Estevam <fabio.estevam@nxp.com>
27Heinrich Schuchardt <xypron.glpk@gmx.de> <heinrich.schuchardt@canonical.com>
28Jagan Teki <402jagan@gmail.com>
29Jagan Teki <jaganna@gmail.com>
30Jagan Teki <jaganna@xilinx.com>
31Jagan Teki <jagannadh.teki@gmail.com>
32Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
33Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
34Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org>
35Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@toradex.com>
36Markus Klotzbuecher <mk@denx.de>
37Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
38Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com>
39Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com>
40Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
41Prabhakar Kushwaha <prabhakar@freescale.com>
42Rajeshwari Shinde <rajeshwari.s@samsung.com>
43Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@uam.es>
44Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@gmail.com>
45Ruchika Gupta <ruchika.gupta@nxp.com> <ruchika.gupta@freescale.com>
46Sandeep Paulraj <s-paulraj@ti.com>
47Shaohui Xie <Shaohui.Xie@freescale.com>
48Stefan Roese <stroese>
49Stefano Babic <sbabic@denx.de>
50TsiChung Liew <Tsi-Chung.Liew@freescale.com>
51Wolfgang Denk <wdenk>
52York Sun <yorksun@freescale.com>
53York Sun <york.sun@nxp.com>
54Łukasz Majewski <l.majewski@samsung.com>
55Lukasz Majewski <lukma@denx.de>
56Mirza <Taimoor_Mirza@mentor.com>
57