]> git.proxmox.com Git - mirror_qemu.git/blame - .mailmap
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
[mirror_qemu.git] / .mailmap
CommitLineData
3bd2608d
EB
1# This mailmap fixes up author names/addresses.
2
3# The first section translates weird addresses from the original git import
4# into proper addresses so that they are counted properly by git shortlog.
4cb01658 5Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
bc02fb30 6Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
863a8341 7Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
4cb01658
PM
8Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
9Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
10Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
11Fabrice Bellard <fabrice@bellard.org> bellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
a7a2d7d2 12James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
4cb01658
PM
13Jocelyn Mayer <l_indien@magic.fr> j_mayer <j_mayer@c046a42c-6fe2-441c-8c8c-71466251a162>
14Paul Brook <paul@codesourcery.com> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
8c2218e3 15Yongbok Kim <yongbok.kim@mips.com> <yongbok.kim@imgtec.com>
4872fee2
AM
16Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@mips.com>
17Aleksandar Markovic <amarkovic@wavecomp.com> <aleksandar.markovic@imgtec.com>
18Paul Burton <pburton@wavecomp.com> <paul.burton@mips.com>
19Paul Burton <pburton@wavecomp.com> <paul.burton@imgtec.com>
20Paul Burton <pburton@wavecomp.com> <paul@archlinuxmips.org>
4cb01658
PM
21Thiemo Seufer <ths@networkno.de> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
22malc <av1474@comtv.ru> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
3bd2608d 23
4cb01658
PM
24# There is also a:
25# (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
26# for the cvs2svn initialization commit e63c3dc74bf.
3bd2608d
EB
27
28# Next, translate a few commits where mailman rewrote the From: line due
29# to strict SPF, although we prefer to avoid adding more entries like that.
30Ed Swierk <eswierk@skyportsystems.com> Ed Swierk via Qemu-devel <qemu-devel@nongnu.org>
31Ian McKellar <ianloic@google.com> Ian McKellar via Qemu-devel <qemu-devel@nongnu.org>
32Julia Suvorova <jusual@mail.ru> Julia Suvorova via Qemu-devel <qemu-devel@nongnu.org>
33Justin Terry (VM) <juterry@microsoft.com> Justin Terry (VM) via Qemu-devel <qemu-devel@nongnu.org>
34
35
57bf554c 36# Also list preferred name forms where people have changed their
d668c82b 37# git author config, or had utf8/latin1 encoding issues.
57bf554c 38Daniel P. Berrangé <berrange@redhat.com>
957e8b34 39Reimar Döffinger <Reimar.Doeffinger@gmx.de>