aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS6
2 files changed, 4 insertions, 3 deletions
diff --git a/.mailmap b/.mailmap
index e4ccac4e2f88..1e14566a3d56 100644
--- a/.mailmap
+++ b/.mailmap
@@ -133,6 +133,7 @@ James Ketrenos <jketreno@io.(none)>
diff --git a/MAINTAINERS b/MAINTAINERS
index 48b0333d19e2..c925fd3c5c3f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9701,7 +9701,7 @@ F: security/keys/encrypted-keys/
KEYS-TRUSTED
M: James Bottomley <[email protected]>
-M: Jarkko Sakkinen <[email protected]>
+M: Jarkko Sakkinen <[email protected]>
M: Mimi Zohar <[email protected]>
@@ -9713,7 +9713,7 @@ F: security/keys/trusted-keys/
KEYS/KEYRINGS
M: David Howells <[email protected]>
-M: Jarkko Sakkinen <[email protected]>
+M: Jarkko Sakkinen <[email protected]>
S: Maintained
F: Documentation/security/keys/core.rst
@@ -17684,7 +17684,7 @@ F: drivers/platform/x86/toshiba-wmi.c
TPM DEVICE DRIVER
M: Peter Huewe <[email protected]>
-M: Jarkko Sakkinen <[email protected]>
+M: Jarkko Sakkinen <[email protected]>
R: Jason Gunthorpe <[email protected]>
S: Maintained