Skip to content

Commit ec1b80b

Browse files
committed
Merge branch 'sb/mailmap-updates'
* sb/mailmap-updates: .mailmap: combine more (email, name) to individual persons .mailmap: Combine more (email, name) to individual persons .mailmap: Map email addresses to names
2 parents 802f878 + c07a6bc commit ec1b80b

File tree

1 file changed

+151
-34
lines changed

1 file changed

+151
-34
lines changed

.mailmap

Lines changed: 151 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,99 +5,216 @@
55
# same person appearing not to be so.
66
#
77

8+
9+
Alejandro R. Sedeño <[email protected]> <[email protected]>
810
Alex Bennée <[email protected]>
11+
12+
13+
14+
915
Alexander Gavrilov <[email protected]>
16+
17+
18+
1019
Aneesh Kumar K.V <[email protected]>
20+
21+
22+
1123
Brian M. Carlson <[email protected]>
24+
25+
1226
Cheng Renquan <[email protected]>
1327
Chris Shoemaker <[email protected]>
28+
29+
1430
Dan Johnson <[email protected]>
15-
Dana L. How <[email protected]>
16-
Dana L. How <[email protected]>
31+
1732
Daniel Barkalow <[email protected]>
33+
1834
David D. Kilzer <[email protected]>
1935
David Kågedal <[email protected]>
36+
David Reiss <[email protected]> <dreiss@dreiss-vmware.(none)>
2037
David S. Miller <[email protected]>
2138
Deskin Miller <[email protected]>
2239
Dirk Süsserott <[email protected]>
40+
41+
2342
Eric S. Raymond <[email protected]>
2443
25-
Fredrik Kuivinen <[email protected]>
44+
Eyvind Bernhardsen <[email protected]> <[email protected]>
45+
Florian Achleitner <[email protected]> <[email protected]>
46+
47+
48+
49+
2650
Frédéric Heitzmann <[email protected]>
51+
52+
53+
54+
2755
H. Merijn Brand <[email protected]> H.Merijn Brand <[email protected]>
28-
H. Peter Anvin <[email protected]>
29-
H. Peter Anvin <[email protected]>
30-
H. Peter Anvin <[email protected]>
56+
57+
58+
59+
60+
Han-Wen Nienhuys <[email protected]> Han-Wen Nienhuys <[email protected]>
3161
Horst H. von Brand <[email protected]>
32-
İsmail Dönmez <[email protected]>
62+
63+
64+
3365
Jakub Narębski <[email protected]>
34-
Jay Soffian <[email protected]>
66+
67+
68+
3569
70+
71+
3672
Joachim Berdal Haga <[email protected]>
37-
38-
73+
Johannes Schindelin <[email protected]> <[email protected]>
3974
40-
Jon Loeliger <[email protected]>
41-
Jon Seymour <[email protected]>
42-
Jonathan Nieder <[email protected]>
75+
76+
77+
78+
79+
80+
81+
Jonathan del Strother <[email protected]> <[email protected]>
82+
83+
84+
4385
44-
45-
46-
4786
4887
88+
89+
4990
50-
Karl Hasselström <[email protected]>
51-
Kevin Leung <[email protected]>
91+
92+
Karl Wiberg <[email protected]> Karl Hasselström <[email protected]>
93+
Karl Wiberg <[email protected]> Karl Hasselström <[email protected]>
94+
95+
96+
97+
Kay Sievers <[email protected]> <kay@mam.(none)>
98+
5299
Kent Engstrom <[email protected]>
100+
Kevin Leung <[email protected]>
101+
102+
103+
53104
Lars Doelle <lars.doelle@on-line ! de>
54105
Lars Doelle <[email protected]>
106+
55107
56-
57-
58-
59108
60-
109+
110+
61111
Linus Torvalds <[email protected]> <[email protected].(none)>
62-
Lukas Sandström <[email protected]>
112+
113+
114+
115+
63116
Marc-André Lureau <[email protected]>
117+
118+
64119
Mark Rada <[email protected]>
65120
66121
Martin von Zweigbergk <[email protected]> <[email protected]>
122+
123+
124+
125+
Matthias Kestenholz <[email protected]> <[email protected]>
126+
Matthias Urlichs <[email protected]> <smurf@kiste.(none)>
127+
67128
Michael Coleman <[email protected]>
68129
69130
Michael W. Olson <[email protected]>
131+
132+
133+
70134
Michele Ballabio <[email protected]>
135+
136+
137+
71138
Nanako Shiraishi <[email protected]>
72139
Nanako Shiraishi <[email protected]>
140+
141+
73142
Nguyễn Thái Ngọc Duy <[email protected]>
74-
75-
143+
Nick Stokoe <[email protected]> Nick Woolley <[email protected]>
144+
Nick Stokoe <[email protected]> Nick Woolley <[email protected]>
145+
Nicolas Morey-Chaisemartin <[email protected]> <[email protected]>
146+
Nicolas Morey-Chaisemartin <[email protected]> <[email protected]>
147+
148+
149+
150+
151+
152+
Paul Mackerras <[email protected]> <paulus@dorrigo.(none)>
153+
Paul Mackerras <[email protected]> <paulus@pogo.(none)>
154+
155+
76156
157+
77158
159+
Petr Baudis <[email protected]> <xpasky@machine>
160+
161+
Philip Jägenstedt <[email protected]> <[email protected]>
162+
Philipp A. Hartmann <[email protected]> <[email protected]>
78163
Philippe Bruhat <[email protected]>
79164
80165
Ramsay Allan Jones <[email protected]>
81166
René Scharfe <[email protected]>
82167
Robert Fitzsimons <[email protected]>
168+
83169
Robert Zeh <[email protected]>
84-
Sam Vilain <[email protected]>
85-
Santi Béjar <[email protected]>
170+
171+
172+
173+
174+
86175
Sean Estabrooks <[email protected]>
176+
Sebastian Schuberth <[email protected]> <[email protected]>
177+
87178
Shawn O. Pearce <[email protected]>
88-
Steven Grimm <[email protected]>
179+
180+
181+
182+
183+
184+
185+
186+
187+
188+
189+
190+
89191
Tay Ray Chuan <[email protected]>
192+
90193
Theodore Ts'o <[email protected]>
194+
91195
196+
197+
198+
199+
200+
201+
92202
Tony Luck <[email protected]>
93-
Uwe Kleine-König <[email protected]>
94-
Uwe Kleine-König <[email protected]>
95-
Uwe Kleine-König <[email protected]>
96-
Uwe Kleine-König <[email protected]>
97-
Uwe Kleine-König <[email protected]>
98-
Ville Skyttä <[email protected]>
203+
204+
205+
206+
207+
208+
209+
210+
99211
Vitaly "_Vi" Shukela <[email protected]>
212+
100213
William Pursell <[email protected]>
214+
215+
101216
YOSHIFUJI Hideaki <[email protected]>
217+
# the two anonymous contributors are different persons:
102218
anonymous <[email protected]>
103219
anonymous <[email protected]>
220+
İsmail Dönmez <[email protected]>

0 commit comments

Comments
 (0)