X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=CREDITS;h=2d9da9a7defa666cbfcd2aab7fcca821f2027066;hb=d96d96eebb06d41010a86cf56b4d9ea47f597152;hp=c05f4ea58ddcd520d25ffed28922f1843ba1a238;hpb=4c9818d8652b9824c73e456dd0d73ffba1d0e64d;p=linux-block.git 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