hw/input/pxa2xx_keypad: Replace hw_error() by qemu_log_mask()

[qemu.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 3816e4effe4f23090157cf53d8dfa4e77cdb24a3..e3628c7a6613b371e0994f897147b062c6c44a36 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -39,11 +39,14 @@ Julia Suvorova <[email protected]> Julia Suvorova via Qemu-devel <qemu-devel@nongnu
 Justin Terry (VM) <[email protected]> Justin Terry (VM) via Qemu-devel <[email protected]>
 
 # Next, replace old addresses by a more recent one.
-Aleksandar Markovic <[email protected]> <[email protected]>
-Aleksandar Markovic <[email protected]> <[email protected]>
-Aleksandar Rikalo <[email protected]> <[email protected]>
+Aleksandar Markovic <[email protected]> <[email protected]>
+Aleksandar Markovic <[email protected]> <[email protected]>
+Aleksandar Markovic <[email protected]> <[email protected]>
+Aleksandar Rikalo <[email protected]> <[email protected]>
+Aleksandar Rikalo <[email protected]> <[email protected]>
 Anthony Liguori <[email protected]> Anthony Liguori <[email protected]>
 James Hogan <[email protected]> <[email protected]>
+Leif Lindholm <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
@@ -151,7 +154,8 @@ Xiaoqiang Zhao <[email protected]>
 Xinhua Cao <[email protected]>
 Xiong Zhang <[email protected]>
 Yin Yin <[email protected]>
-yuchenlin <[email protected]>
+Yu-Chen Lin <[email protected]>
+Yu-Chen Lin <[email protected]> <[email protected]>
 YunQiang Su <[email protected]>
 YunQiang Su <[email protected]>
 Yuri Pudgorodskiy <[email protected]>