More mailmap fixes and simplifications

Signed-off-by: Jean-Baptiste Kempf <[email protected]>

.mailmap

@@ -98,7 +98,8 @@ Alexander Law <[email protected]>
 Denis Arnaud <[email protected]>
 Éric Lassauge <[email protected]>
 Faustino Osuna <[email protected]>
-Mihkel Kirjutas <[email protected]> 
+Faustino Osuna <[email protected]> Faustino E. Osuna <[email protected]>
+Mihkel Kirjutas <[email protected]>
 Naohiro Koriyama <[email protected]>
 Predrag Ljubenović <[email protected]>
 Ajith Manjula Senarathne <[email protected]>
@@ -110,6 +111,18 @@ Jérôme Decoodt <[email protected]> Jérôme Decoodt <[email protected]>
 Matej Urban <[email protected]> Matej Urbančič <[email protected]>
 Xabier Aramendi <[email protected]>
 Gwenole Beauchesne <[email protected]>
+Frédéric Yhuel <[email protected]>
+Ming Hu <[email protected]>
+Kuan-Chung Chiu <[email protected]>
+Cédric Cocquebert <[email protected]>
+François Cartegnie <[email protected]>
+Jean-Paul Saman <[email protected]>
+Jean-Paul Saman <[email protected]> [email protected] <[email protected]>
+Jean-Paul Saman <[email protected]> Jean-Paul Saman <[email protected]>
+Samuel Hocevar <[email protected]>
+Samuel Hocevar <[email protected]> Sam Hocevar <[email protected]>
+Samuel Hocevar <[email protected]> Sam Hocevar <[email protected]>
+Yannick Bréhon <[email protected]>
 #
 # Preferred emails
 <[email protected]> <[email protected]>