diff --git a/.mailmap b/.mailmap index 0d8940d37bf41a6517a5c490fb0772c95f2a2a08..347d47e27da2f47dcc107e37f9d77c82f490853b 100644 --- a/.mailmap +++ b/.mailmap @@ -370,6 +370,8 @@ Paul E. McKenney <paulmck@kernel.org> <paul.mckenney@linaro.org> Paul E. McKenney <paulmck@kernel.org> <paulmck@linux.ibm.com> Paul E. McKenney <paulmck@kernel.org> <paulmck@linux.vnet.ibm.com> Paul E. McKenney <paulmck@kernel.org> <paulmck@us.ibm.com> +Paul Mackerras <paulus@ozlabs.org> <paulus@samba.org> +Paul Mackerras <paulus@ozlabs.org> <paulus@au1.ibm.com> Peter A Jonsson <pj@ludd.ltu.se> Peter Oruba <peter.oruba@amd.com> Peter Oruba <peter@oruba.de>