disas/nanomips: Remove #include <sstream>

[qemu.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index b914c9e290e092dd1bfba9e97b8c0204686b68cd..35dddbe27b6518d789ea791948ebd235706465b5 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -27,6 +27,14 @@ Paul Brook <[email protected]> pbrook <pbrook@c046a42c-6fe2-441c-8c8c-714662
 Thiemo Seufer <[email protected]> ths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>
 malc <[email protected]> malc <malc@c046a42c-6fe2-441c-8c8c-71466251a162>
 
+# Corrupted Author fields
+Aaron Larson <[email protected]> [email protected]
+Andreas Färber <[email protected]> Andreas Färber <andreas.faerber>
+Jason Wang <[email protected]> Jason Wang <jasowang>
+Marek Dolata <[email protected]> [email protected] <[email protected]>
+Michael Ellerman <[email protected]> [email protected] <[email protected]>
+Nick Hudson <[email protected]> [email protected] <[email protected]>
+
 # There is also a:
 #    (no author) <(no author)@c046a42c-6fe2-441c-8c8c-71466251a162>
 # for the cvs2svn initialization commit e63c3dc74bf.
@@ -46,23 +54,34 @@ Aleksandar Rikalo <[email protected]> <[email protected]>
 Aleksandar Rikalo <[email protected]> <[email protected]>
 Alexander Graf <[email protected]> <[email protected]>
 Anthony Liguori <[email protected]> Anthony Liguori <[email protected]>
+Christian Borntraeger <[email protected]> <[email protected]>
 Filip Bozuta <[email protected]> <[email protected]>
-Frederic Konrad <[email protected]> <[email protected]>
+Frederic Konrad <[email protected]> <[email protected]>
+Frederic Konrad <[email protected]> <[email protected]>
 Greg Kurz <[email protected]> <[email protected]>
+Huacai Chen <[email protected]> <[email protected]>
+Huacai Chen <[email protected]> <[email protected]>
 James Hogan <[email protected]> <[email protected]>
-Leif Lindholm <[email protected]> <[email protected]>
+Leif Lindholm <[email protected]> <[email protected]>
+Leif Lindholm <[email protected]> <[email protected]>
 Radoslaw Biernacki <[email protected]> <[email protected]>
+Paul Brook <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
+Philippe Mathieu-Daudé <[email protected]> <[email protected]>
+Philippe Mathieu-Daudé <[email protected]> <[email protected]>
+Philippe Mathieu-Daudé <[email protected]> <[email protected]>
 Stefan Brankovic <[email protected]> <[email protected]>
 Yongbok Kim <[email protected]> <[email protected]>
 
 # Also list preferred name forms where people have changed their
 # git author config, or had utf8/latin1 encoding issues.
 Aaron Lindsay <[email protected]>
+Aaron Larson <[email protected]>
 Alexey Gerasimenko <[email protected]>
+Alex Chen <[email protected]>
 Alex Ivanov <[email protected]>
 Andreas Färber <[email protected]>
 Bandan Das <[email protected]>
@@ -85,6 +104,7 @@ Christophe Lyon <[email protected]>
 Collin L. Walling <[email protected]>
 Daniel P. Berrangé <[email protected]>
 Eduardo Otubo <[email protected]>
+Erik Smit <[email protected]>
 Fabrice Desclaux <[email protected]>
 Fernando Luis Vázquez Cao <[email protected]>
 Fernando Luis Vázquez Cao <[email protected]>
@@ -92,8 +112,11 @@ Gautham R. Shenoy <[email protected]>
 Gautham R. Shenoy <[email protected]>
 Gonglei (Arei) <[email protected]>
 Guang Wang <[email protected]>
+Haibin Zhang <[email protected]>
 Hailiang Zhang <[email protected]>
+Hanna Reitz <[email protected]> <[email protected]>
 Hervé Poussineau <[email protected]>
+Hyman Huang <[email protected]>
 Jakub Jermář <[email protected]>
 Jakub Jermář <[email protected]>
 Jean-Christophe Dubois <[email protected]>
@@ -127,9 +150,11 @@ Nicholas Thomas <[email protected]>
 Nikunj A Dadhania <[email protected]>
 Orit Wasserman <[email protected]>
 Paolo Bonzini <[email protected]>
+Pan Nengyuan <[email protected]>
 Pavel Dovgaluk <[email protected]>
 Pavel Dovgaluk <[email protected]>
 Pavel Dovgaluk <[email protected]>
+Peter Chubb <[email protected]>
 Peter Crosthwaite <[email protected]>
 Peter Crosthwaite <[email protected]>
 Peter Crosthwaite <[email protected]>
@@ -142,6 +167,7 @@ Roger Pau Monné <[email protected]>
 Shin'ichiro Kawasaki <[email protected]>
 Shin'ichiro Kawasaki <[email protected]>
 Sochin Jiang <[email protected]>
+Stefan Berger <[email protected]> <[email protected]>
 Takashi Yoshii <[email protected]>
 Thomas Huth <[email protected]>
 Thomas Knych <[email protected]>