Merge tag 'sysctl-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof...

[linux.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index 68e72a6017a0ee74ebb77b1981bec24c00275c67..03587c4330979fc4446775f70ca913286c320d64 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -377,7 +377,7 @@ Martin Kepplinger <[email protected]> <[email protected]>
 Martin Kepplinger <[email protected]> <[email protected]>
 Martin Kepplinger <[email protected]> <[email protected]>
 Martyna Szapar-Mudlaw <[email protected]> <[email protected]>
-Mathieu Othacehe <[email protected]>
+Mathieu Othacehe <[email protected]> <[email protected]>
 Mat Martineau <[email protected]> <[email protected]>
 Mat Martineau <[email protected]> <[email protected]>
 Matthew Wilcox <[email protected]> <[email protected]>
@@ -436,6 +436,7 @@ Muna Sinada <[email protected]> <[email protected]>
 Murali Nalajala <[email protected]> <[email protected]>
 Mythri P K <[email protected]>
 Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
+Naoya Horiguchi <[email protected]> <[email protected]>
 Nathan Chancellor <[email protected]> <[email protected]>
 Neeraj Upadhyay <[email protected]> <[email protected]>
 Neil Armstrong <[email protected]> <[email protected]>
@@ -477,6 +478,8 @@ Paul E. McKenney <[email protected]> <[email protected]>
 Paul E. McKenney <[email protected]> <[email protected]>
 Paul Mackerras <[email protected]> <[email protected]>
 Paul Mackerras <[email protected]> <[email protected]>
+Paul Moore <[email protected]> <[email protected]>
+Paul Moore <[email protected]> <[email protected]>
 Pavankumar Kondeti <[email protected]> <[email protected]>
 Peter A Jonsson <[email protected]>
 Peter Oruba <[email protected]>
@@ -541,6 +544,8 @@ Sebastian Reichel <[email protected]> <[email protected]>
 Sebastian Reichel <[email protected]> <[email protected]>
 Sedat Dilek <[email protected]> <[email protected]>
 Senthilkumar N L <[email protected]> <[email protected]>
+Serge Hallyn <[email protected]> <[email protected]>
+Serge Hallyn <[email protected]> <[email protected]>
 Seth Forshee <[email protected]> <[email protected]>
 Shannon Nelson <[email protected]> <[email protected]>
 Shannon Nelson <[email protected]> <[email protected]>
@@ -637,4 +642,5 @@ Wolfram Sang <[email protected]> <[email protected]>
 Wolfram Sang <[email protected]> <[email protected]>
 Yakir Yang <[email protected]> <[email protected]>
 Yusuke Goda <[email protected]>
+Zack Rusin <[email protected]> <[email protected]>
 Zhu Yanjun <[email protected]> <[email protected]>