Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
[platform/kernel/linux-exynos.git] / .mailmap
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 # repo-abbrev: /pub/scm/linux/kernel/git/
8 #
9
10 Aaron Durbin <adurbin@google.com>
11 Adam Oldham <oldhamca@gmail.com>
12 Adam Radford <aradford@gmail.com>
13 Adrian Bunk <bunk@stusta.de>
14 Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
15 Alan Cox <alan@lxorguk.ukuu.org.uk>
16 Alan Cox <root@hraefn.swansea.linux.org.uk>
17 Aleksey Gorelov <aleksey_gorelov@phoenix.com>
18 Al Viro <viro@ftp.linux.org.uk>
19 Al Viro <viro@zenIV.linux.org.uk>
20 Andreas Herrmann <aherrman@de.ibm.com>
21 Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
22 Andrew Morton <akpm@linux-foundation.org>
23 Andrew Vasquez <andrew.vasquez@qlogic.com>
24 Andy Adamson <andros@citi.umich.edu>
25 Antoine Tenart <antoine.tenart@free-electrons.com>
26 Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
27 Archit Taneja <archit@ti.com>
28 Arnaud Patard <arnaud.patard@rtp-net.org>
29 Arnd Bergmann <arnd@arndb.de>
30 Axel Dyks <xl@xlsigned.net>
31 Axel Lin <axel.lin@gmail.com>
32 Ben Gardner <bgardner@wabtec.com>
33 Ben M Cahill <ben.m.cahill@intel.com>
34 Björn Steinbrink <B.Steinbrink@gmx.de>
35 Boris Brezillon <boris.brezillon@free-electrons.com>
36 Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>
37 Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>
38 Brian Avery <b.avery@hp.com>
39 Brian King <brking@us.ibm.com>
40 Christoph Hellwig <hch@lst.de>
41 Christophe Ricard <christophe.ricard@gmail.com>
42 Corey Minyard <minyard@acm.org>
43 Damian Hobson-Garcia <dhobsong@igel.co.jp>
44 David Brownell <david-b@pacbell.net>
45 David Woodhouse <dwmw2@shinybook.infradead.org>
46 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
47 Domen Puncer <domen@coderock.org>
48 Douglas Gilbert <dougg@torque.net>
49 Ed L. Cashin <ecashin@coraid.com>
50 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
51 Felipe W Damasio <felipewd@terra.com.br>
52 Felix Kuhling <fxkuehl@gmx.de>
53 Felix Moeller <felix@derklecks.de>
54 Filipe Lautert <filipe@icewall.org>
55 Franck Bui-Huu <vagabon.xyz@gmail.com>
56 Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
57 Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
58 Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
59 Frank Zago <fzago@systemfabricworks.com>
60 Greg Kroah-Hartman <greg@echidna.(none)>
61 Greg Kroah-Hartman <gregkh@suse.de>
62 Greg Kroah-Hartman <greg@kroah.com>
63 Henk Vergonet <Henk.Vergonet@gmail.com>
64 Henrik Kretzschmar <henne@nachtwindheim.de>
65 Henrik Rydberg <rydberg@bitmath.org>
66 Herbert Xu <herbert@gondor.apana.org.au>
67 Jacob Shin <Jacob.Shin@amd.com>
68 James Bottomley <jejb@mulgrave.(none)>
69 James Bottomley <jejb@titanic.il.steeleye.com>
70 James E Wilson <wilson@specifix.com>
71 James Ketrenos <jketreno@io.(none)>
72 Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
73 <javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
74 Jean Tourrilhes <jt@hpl.hp.com>
75 Jeff Garzik <jgarzik@pretzel.yyz.us>
76 Jens Axboe <axboe@suse.de>
77 Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
78 Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
79 Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
80 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
81 John Stultz <johnstul@us.ibm.com>
82 <josh@joshtriplett.org> <josh@freedesktop.org>
83 <josh@joshtriplett.org> <josh@kernel.org>
84 <josh@joshtriplett.org> <josht@linux.vnet.ibm.com>
85 <josh@joshtriplett.org> <josht@us.ibm.com>
86 <josh@joshtriplett.org> <josht@vnet.ibm.com>
87 Juha Yrjola <at solidboot.com>
88 Juha Yrjola <juha.yrjola@nokia.com>
89 Juha Yrjola <juha.yrjola@solidboot.com>
90 Kay Sievers <kay.sievers@vrfy.org>
91 Kenneth W Chen <kenneth.w.chen@intel.com>
92 Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
93 Koushik <raghavendra.koushik@neterion.com>
94 Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
95 Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
96 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
97 Leonid I Ananiev <leonid.i.ananiev@intel.com>
98 Linas Vepstas <linas@austin.ibm.com>
99 Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
100 Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
101 Mark Brown <broonie@sirena.org.uk>
102 Matthieu CASTET <castet.matthieu@free.fr>
103 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>
104 Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
105 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org>
106 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
107 Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
108 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
109 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
110 Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
111 Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
112 Mayuresh Janorkar <mayur@ti.com>
113 Michael Buesch <m@bues.ch>
114 Michel Dänzer <michel@tungstengraphics.com>
115 Mitesh shah <mshah@teja.com>
116 Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
117 Morten Welinder <terra@gnome.org>
118 Morten Welinder <welinder@anemone.rentec.com>
119 Morten Welinder <welinder@darter.rentec.com>
120 Morten Welinder <welinder@troll.com>
121 Mythri P K <mythripk@ti.com>
122 Nguyen Anh Quynh <aquynh@gmail.com>
123 Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
124 Patrick Mochel <mochel@digitalimplant.org>
125 Peter A Jonsson <pj@ludd.ltu.se>
126 Peter Oruba <peter@oruba.de>
127 Peter Oruba <peter.oruba@amd.com>
128 Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
129 Praveen BP <praveenbp@ti.com>
130 Rajesh Shah <rajesh.shah@intel.com>
131 Ralf Baechle <ralf@linux-mips.org>
132 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
133 Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
134 Rémi Denis-Courmont <rdenis@simphalempin.com>
135 Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
136 Rudolf Marek <R.Marek@sh.cvut.cz>
137 Rui Saraiva <rmps@joel.ist.utl.pt>
138 Sachin P Sant <ssant@in.ibm.com>
139 Sam Ravnborg <sam@mars.ravnborg.org>
140 Santosh Shilimkar <ssantosh@kernel.org>
141 Santosh Shilimkar <santosh.shilimkar@oracle.org>
142 Sascha Hauer <s.hauer@pengutronix.de>
143 S.Çağlar Onur <caglar@pardus.org.tr>
144 Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
145 Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
146 Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
147 Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
148 Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
149 Simon Kelley <simon@thekelleys.org.uk>
150 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
151 Stephen Hemminger <shemminger@osdl.org>
152 Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
153 Sumit Semwal <sumit.semwal@ti.com>
154 Tejun Heo <htejun@gmail.com>
155 Thomas Graf <tgraf@suug.ch>
156 Tony Luck <tony.luck@intel.com>
157 Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
158 Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
159 Uwe Kleine-König <ukl@pengutronix.de>
160 Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
161 Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
162 Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
163 Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
164 Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
165 Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
166 Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
167 Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
168 Takashi YOSHII <takashi.yoshii.zj@renesas.com>
169 Yusuke Goda <goda.yusuke@renesas.com>
170 Gustavo Padovan <gustavo@las.ic.unicamp.br>
171 Gustavo Padovan <padovan@profusion.mobi>