summaryrefslogtreecommitdiff
path: root/CREDITS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-05-05 23:16:42 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2023-05-05 23:16:42 +0300
commit647681bfa678400f0117d214313005cbfaf79f48 (patch)
tree811ad03c41b123be496cb0d0930752d129c97ab6 /CREDITS
parente919a3f7057b5ca918dea98826b39a38eff9bebb (diff)
parentcdc822dda6f82269b94d5fa60ddc71d98c160fa0 (diff)
downloadlinux-647681bfa678400f0117d214313005cbfaf79f48.tar.xz
Merge tag 'docs-6.4-2' of git://git.lwn.net/linux
Pull more documentation updates from Jonathan Corbet: "A handful of late-arriving documentation fixes, plus one Spanish translation that has been ready for some time but got applied late" * tag 'docs-6.4-2' of git://git.lwn.net/linux: docs/sp_SP: Add translation of process/adding-syscalls CREDITS: Update email address for Mat Martineau Documentation: update kernel stack for x86_64 docs: Remove unnecessary unicode character docs: fix "Reviewd" typo Documentation: timers: hrtimers: Make hybrid union historical docs/admin-guide/mm/ksm.rst fix intraface -> interface typo doc:it_IT: fix some typos
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS4
1 files changed, 2 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index c05f4ea58ddc..2d9da9a7defa 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