blob: 8acce4b2bfe4c49f78a9ff697b291043f9ff431c [file] [log] [blame]
Masahiro Yamadac952a312014-07-16 17:49:44 +09001#
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#
Heinrich Schuchardt9f7c4712019-08-10 13:17:21 +02007# This file is also used by scripts/get_maintainer.pl.
8#
Masahiro Yamadac952a312014-07-16 17:49:44 +09009# This file can be modified by hand or updated by the following command:
10# scripts/mailmapper > tmp; mv tmp .mailmap
11#
Heinrich Schuchardt9f7c4712019-08-10 13:17:21 +020012# 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>
Masahiro Yamadac952a312014-07-16 17:49:44 +090017
Heinrich Schuchardt9f7c4712019-08-10 13:17:21 +020018Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
Masahiro Yamada4e978f62014-07-16 17:49:46 +090019Allen Martin <amartin@nvidia.com>
20Andreas Bießmann <andreas.devel@googlemail.com>
Andreas Bießmann07dafdb2016-05-01 03:46:16 +020021Andreas Bießmann <andreas@biessmann.org>
Masahiro Yamada4e978f62014-07-16 17:49:46 +090022Aneesh V <aneesh@ti.com>
Heinrich Schuchardt7e462012022-01-09 18:51:27 +010023Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>
24Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>
Michal Simekee87ba62022-03-01 12:43:32 +010025Bin Meng <bmeng.cn@gmail.com> <bin.meng@windriver.com>
Heinrich Schuchardtc6f67942019-12-12 18:07:49 +010026Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
27Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
Masahiro Yamada4e978f62014-07-16 17:49:46 +090028Dirk Behme <dirk.behme@googlemail.com>
Fabio Estevam96ccad02016-01-11 10:22:40 -020029Fabio Estevam <fabio.estevam@nxp.com>
Heinrich Schuchardt11cd5152021-10-23 16:08:29 +020030Heinrich Schuchardt <xypron.glpk@gmx.de> <heinrich.schuchardt@canonical.com>
Michal Simek5642de22022-03-07 08:41:21 +010031Heinrich Schuchardt <xypron.glpk@gmx.de> xypron.glpk@gmx.de <xypron.glpk@gmx.de>
Jagan Tekibdef75a2015-12-07 01:26:13 +053032Jagan Teki <402jagan@gmail.com>
33Jagan Teki <jaganna@gmail.com>
34Jagan Teki <jaganna@xilinx.com>
35Jagan Teki <jagannadh.teki@gmail.com>
36Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
Jernej Skrabec43c161d2021-08-22 07:23:48 +020037Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
Igor Opaniuk6e6f3672019-12-17 14:48:54 +020038Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org>
Igor Opaniuk6ad22a22020-12-30 19:25:47 +020039Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@toradex.com>
Marek Behúnd63726e2022-06-01 17:17:06 +020040Marek Behún <kabel@kernel.org> <marek.behun@nic.cz>
41Marek Behún <kabel@kernel.org> Marek Behun <marek.behun@nic.cz>
Michal Simekee87ba62022-03-01 12:43:32 +010042Marek Vasut <marex@denx.de> <marek.vasut+renesas@gmail.com>
43Marek Vasut <marex@denx.de> <marek.vasut@gmail.com>
44Marek Vasut <marex@denx.de> <marex at denx.de>
Masahiro Yamada4e978f62014-07-16 17:49:46 +090045Markus Klotzbuecher <mk@denx.de>
Michal Simekee87ba62022-03-01 12:43:32 +010046Masahiro Yamada <yamada.masahiro@socionext.com> <yamada.m@jp.panasonic.com>
47Masahiro Yamada <yamada.masahiro@socionext.com> <masahiroy@kernel.org>
Michal Simek659a77b2022-04-14 15:50:46 +020048Michal Simek <michal.simek@amd.com> <michal.simek@xilinx.com>
Michal Simekee87ba62022-03-01 12:43:32 +010049Michal Simek <michal.simek@xilinx.com> <monstr@monstr.eu>
50Michal Simek <michal.simek@xilinx.com> <Monstr@seznam.cz>
51Michal Simek <michal.simek@xilinx.com> <root@monstr.eu>
Neil Armstrong172c7902022-08-16 11:58:08 +020052Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
Nicolas Saenz Julienneaab2af82021-09-16 11:55:48 +020053Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
Patrice Chotard5002db12020-12-02 18:47:31 +010054Patrice Chotard <patrice.chotard@foss.st.com> <patrice.chotard@st.com>
55Patrick Delaunay <patrick.delaunay@foss.st.com> <patrick.delaunay@st.com>
Paul Burtonb8551b92017-10-30 16:58:21 -070056Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
Masahiro Yamada4e978f62014-07-16 17:49:46 +090057Prabhakar Kushwaha <prabhakar@freescale.com>
58Rajeshwari Shinde <rajeshwari.s@samsung.com>
Ricardo Ribalda Delgado0a740012019-08-23 15:59:55 +020059Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@uam.es>
60Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@gmail.com>
Heinrich Schuchardt214aaed2020-04-15 18:47:38 +000061Ruchika Gupta <ruchika.gupta@nxp.com> <ruchika.gupta@freescale.com>
Masahiro Yamada4e978f62014-07-16 17:49:46 +090062Sandeep Paulraj <s-paulraj@ti.com>
63Shaohui Xie <Shaohui.Xie@freescale.com>
Michal Simekee87ba62022-03-01 12:43:32 +010064Stefan Roese <sr@denx.de> <stroese>
Masahiro Yamada4e978f62014-07-16 17:49:46 +090065Stefano Babic <sbabic@denx.de>
Michal Simekee87ba62022-03-01 12:43:32 +010066Tom Rini <trini@konsulko.com> <trini@ti.com>
Masahiro Yamada4e978f62014-07-16 17:49:46 +090067TsiChung Liew <Tsi-Chung.Liew@freescale.com>
Michal Simekee87ba62022-03-01 12:43:32 +010068Wolfgang Denk <wd@denx.de> <wdenk>
69Wolfgang Denk <wd@denx.de> <wd@pollux.denx.de>
70Wolfgang Denk <wd@denx.de> <wd@pollux.(none)>
71Wolfgang Denk <wd@denx.de> <wd@fifi.denx.de>
72Wolfgang Denk <wd@denx.de> <wd@nyx.denx.de>
73Wolfgang Denk <wd@denx.de> <wd@atlas.denx.de>
74Wolfgang Denk <wd@denx.de> <wd@castor.denx.de>
75Wolfgang Denk <wd@denx.de> <wd@xpert.denx.de>
76Wolfgang Denk <wd@denx.de> <wd@nyx.(none)>
Masahiro Yamada4e978f62014-07-16 17:49:46 +090077York Sun <yorksun@freescale.com>
York Sund1bb1a22016-01-05 09:48:45 -080078York Sun <york.sun@nxp.com>
Masahiro Yamada4e978f62014-07-16 17:49:46 +090079Łukasz Majewski <l.majewski@samsung.com>
Lukasz Majewski6ee9d722018-07-26 00:37:14 +020080Lukasz Majewski <lukma@denx.de>
Michal Simekc2b23af2018-07-24 12:51:37 +020081Mirza <Taimoor_Mirza@mentor.com>