summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat Martineau <martineau@kernel.org>2023-05-01 17:05:44 -0700
committerJonathan Corbet <corbet@lwn.net>2023-05-02 11:00:46 -0600
commit37c95f3a3d251a9319ed137ee0adf5ab9e431ce2 (patch)
tree6e4c8e031d74dbbc035a529a77f26b74e8b6f76b
parent530421acaeda1d8c3533f241db944127f69efadc (diff)
downloadlinux-stable-37c95f3a3d251a9319ed137ee0adf5ab9e431ce2.tar.gz
linux-stable-37c95f3a3d251a9319ed137ee0adf5ab9e431ce2.tar.bz2
linux-stable-37c95f3a3d251a9319ed137ee0adf5ab9e431ce2.zip
CREDITS: Update email address for Mat Martineau
Changing my email address in CREDITS to be consistent with what's in use in MAINTAINERS and mailmap. Also removed extra date information from the CREDITS entry since I'm a maintainer for MPTCP again. Signed-off-by: Mat Martineau <martineau@kernel.org> Link: https://lore.kernel.org/r/20230502000545.2899055-1-martineau@kernel.org Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r--CREDITS4
1 files changed, 2 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index b6c93e0a62c3..fa076dba2f1a 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2510,8 +2510,8 @@ D: XF86_8514
D: cfdisk (curses based disk partitioning program)
N: Mat Martineau
-E: mat@martineau.name
-D: MPTCP subsystem co-maintainer 2020-2023
+E: martineau@kernel.org
+D: MPTCP subsystem co-maintainer
D: Keyctl restricted keyring and Diffie-Hellman UAPI
D: Bluetooth L2CAP ERTM mode and AMP
S: USA