aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap2
-rw-r--r--MAINTAINERS4
2 files changed, 4 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index c69d9c734fb5..ef310eeed7b5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -95,6 +95,8 @@ Greg Kroah-Hartman <[email protected]>
Greg Kroah-Hartman <[email protected]>
Henk Vergonet <[email protected]>
Henrik Kretzschmar <[email protected]>
Henrik Rydberg <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 1d4aa7f942de..76d6324b80ce 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3306,7 +3306,7 @@ X: arch/riscv/net/bpf_jit_comp32.c
BPF JIT for S390
M: Ilya Leoshkevich <[email protected]>
-M: Heiko Carstens <[email protected]>
+M: Heiko Carstens <[email protected]>
M: Vasily Gorbik <[email protected]>
@@ -14831,7 +14831,7 @@ S: Maintained
F: drivers/video/fbdev/savage/
S390
-M: Heiko Carstens <[email protected]>
+M: Heiko Carstens <[email protected]>
M: Vasily Gorbik <[email protected]>
M: Christian Borntraeger <[email protected]>