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.
7 # This file is also used by scripts/get_maintainer.pl.
9 # This file can be modified by hand or updated by the following command:
10 # scripts/mailmapper > tmp; mv tmp .mailmap
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>
18 Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
19 Allen Martin <amartin@nvidia.com>
20 Andreas Bießmann <andreas.devel@googlemail.com>
21 Andreas Bießmann <andreas@biessmann.org>
22 Aneesh V <aneesh@ti.com>
23 Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>
24 Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>
25 Bin Meng <bmeng.cn@gmail.com> <bin.meng@windriver.com>
26 Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
27 Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
28 Dirk Behme <dirk.behme@googlemail.com>
29 Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>
30 Fabio Estevam <fabio.estevam@nxp.com>
31 Heinrich Schuchardt <xypron.glpk@gmx.de> <heinrich.schuchardt@canonical.com>
32 Heinrich Schuchardt <xypron.glpk@gmx.de> xypron.glpk@gmx.de <xypron.glpk@gmx.de>
33 Jagan Teki <402jagan@gmail.com>
34 Jagan Teki <jaganna@gmail.com>
35 Jagan Teki <jaganna@xilinx.com>
36 Jagan Teki <jagannadh.teki@gmail.com>
37 Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
38 Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
39 Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org>
40 Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@toradex.com>
41 Marek Behún <kabel@kernel.org> <marek.behun@nic.cz>
42 Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>
43 Marek Vasut <marex@denx.de> <marek.vasut+renesas@gmail.com>
44 Marek Vasut <marex@denx.de> <marek.vasut@gmail.com>
45 Marek Vasut <marex@denx.de> <marex at denx.de>
46 Markus Klotzbuecher <mk@denx.de>
47 Masahiro Yamada <yamada.masahiro@socionext.com> <yamada.m@jp.panasonic.com>
48 Masahiro Yamada <yamada.masahiro@socionext.com> <masahiroy@kernel.org>
49 Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>
50 Michal Simek <michal.simek@xilinx.com> <monstr@monstr.eu>
51 Michal Simek <michal.simek@xilinx.com> <Monstr@seznam.cz>
52 Michal Simek <michal.simek@xilinx.com> <root@monstr.eu>
53 Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
54 Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
55 Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com>
56 Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com>
57 Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
58 Prabhakar Kushwaha <prabhakar@freescale.com>
59 Rajeshwari Shinde <rajeshwari.s@samsung.com>
60 Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@uam.es>
61 Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@gmail.com>
62 Ruchika Gupta <ruchika.gupta@nxp.com> <ruchika.gupta@freescale.com>
63 Sandeep Paulraj <s-paulraj@ti.com>
64 Shaohui Xie <Shaohui.Xie@freescale.com>
65 Stefan Roese <sr@denx.de> <stroese>
66 Stefano Babic <sbabic@denx.de>
67 Tom Rini <trini@konsulko.com> <trini@ti.com>
68 TsiChung Liew <Tsi-Chung.Liew@freescale.com>
69 Wolfgang Denk <wd@denx.de> <wdenk>
70 Wolfgang Denk <wd@denx.de> <wd@pollux.denx.de>
71 Wolfgang Denk <wd@denx.de> <wd@pollux.(none)>
72 Wolfgang Denk <wd@denx.de> <wd@fifi.denx.de>
73 Wolfgang Denk <wd@denx.de> <wd@nyx.denx.de>
74 Wolfgang Denk <wd@denx.de> <wd@atlas.denx.de>
75 Wolfgang Denk <wd@denx.de> <wd@castor.denx.de>
76 Wolfgang Denk <wd@denx.de> <wd@xpert.denx.de>
77 Wolfgang Denk <wd@denx.de> <wd@nyx.(none)>
78 York Sun <yorksun@freescale.com>
79 York Sun <york.sun@nxp.com>
80 Łukasz Majewski <l.majewski@samsung.com>
81 Lukasz Majewski <lukma@denx.de>
82 Mirza <Taimoor_Mirza@mentor.com>