From 631604b492010c92d7ffe887fd05a9fba18f0cc7 Mon Sep 17 00:00:00 2001 From: Martin Kepplinger Date: Tue, 24 Sep 2019 08:28:02 +0200 Subject: mailmap: add new email address for Martin Kepplinger Include my new email address for tracking my contributions. Signed-off-by: Martin Kepplinger Signed-off-by: Jonathan Corbet --- .mailmap | 1 + 1 file changed, 1 insertion(+) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index edcac87e76c8..70105bb57650 100644 --- a/.mailmap +++ b/.mailmap @@ -151,6 +151,7 @@ Mark Brown Mark Yao Martin Kepplinger Martin Kepplinger +Martin Kepplinger Mathieu Othacehe Matthew Wilcox Matthew Wilcox -- cgit v1.2.1 From 0ad8f7aa9f7ea839409f7f15f155a73f4f2d08b3 Mon Sep 17 00:00:00 2001 From: Paul Burton Date: Wed, 16 Oct 2019 11:23:16 -0700 Subject: MAINTAINERS: Use @kernel.org address for Paul Burton Switch to using my paulburton@kernel.org email address in order to avoid subject mangling that's being imposed on my previous address. Signed-off-by: Paul Burton Signed-off-by: Paul Burton Cc: linux-kernel@vger.kernel.org --- .mailmap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index edcac87e76c8..10b27ecb61c0 100644 --- a/.mailmap +++ b/.mailmap @@ -196,7 +196,8 @@ Oleksij Rempel Oleksij Rempel Paolo 'Blaisorblade' Giarrusso Patrick Mochel -Paul Burton +Paul Burton +Paul Burton Peter A Jonsson Peter Oruba Peter Oruba -- cgit v1.2.1 From 8b5c712f27044dc7812ceea5964eb2ea8952da78 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Wed, 6 Nov 2019 15:41:32 +0100 Subject: MAINTAINERS: update Ard's email address to @kernel.org Cc: Ard Biesheuvel Cc: Ard Biesheuvel Signed-off-by: Ard Biesheuvel --- .mailmap | 1 + 1 file changed, 1 insertion(+) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index 83d7e750c2fc..5d3b741a3f95 100644 --- a/.mailmap +++ b/.mailmap @@ -32,6 +32,7 @@ Andy Adamson Antoine Tenart Antonio Ospite Archit Taneja +Ard Biesheuvel Arnaud Patard Arnd Bergmann Axel Dyks -- cgit v1.2.1