aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS16
2 files changed, 9 insertions, 8 deletions
diff --git a/.mailmap b/.mailmap
index 07a777f9d687..6b06a19e5033 100644
--- a/.mailmap
+++ b/.mailmap
@@ -238,6 +238,7 @@ Vlad Dogaru <[email protected]> <[email protected]>
Takashi YOSHII <[email protected]>
Yusuke Goda <[email protected]>
Gustavo Padovan <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 5cfbea4ce575..651545fc87ca 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1233,7 +1233,7 @@ F: arch/arm/lib/floppydma.S
F: arch/arm/include/asm/floppy.h
ARM PMU PROFILING AND DEBUGGING
-M: Will Deacon <[email protected]>
+M: Will Deacon <[email protected]>
M: Mark Rutland <[email protected]>
S: Maintained
L: [email protected] (moderated for non-subscribers)
@@ -1305,7 +1305,7 @@ F: Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt
F: drivers/irqchip/irq-vic.c
ARM SMMU DRIVERS
-M: Will Deacon <[email protected]>
+M: Will Deacon <[email protected]>
R: Robin Murphy <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Maintained
@@ -2539,7 +2539,7 @@ F: drivers/i2c/busses/i2c-xiic.c
ARM64 PORT (AARCH64 ARCHITECTURE)
M: Catalin Marinas <[email protected]>
-M: Will Deacon <[email protected]>
+M: Will Deacon <[email protected]>
L: [email protected] (moderated for non-subscribers)
T: git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
S: Maintained
@@ -2723,7 +2723,7 @@ S: Maintained
F: drivers/net/wireless/atmel/atmel*
ATOMIC INFRASTRUCTURE
-M: Will Deacon <[email protected]>
+M: Will Deacon <[email protected]>
M: Peter Zijlstra <[email protected]>
R: Boqun Feng <[email protected]>
@@ -9110,7 +9110,7 @@ F: drivers/misc/lkdtm/*
LINUX KERNEL MEMORY CONSISTENCY MODEL (LKMM)
M: Alan Stern <[email protected]>
M: Andrea Parri <[email protected]>
-M: Will Deacon <[email protected]>
+M: Will Deacon <[email protected]>
M: Peter Zijlstra <[email protected]>
M: Boqun Feng <[email protected]>
M: Nicholas Piggin <[email protected]>
@@ -9218,7 +9218,7 @@ F: Documentation/admin-guide/LSM/LoadPin.rst
LOCKING PRIMITIVES
M: Peter Zijlstra <[email protected]>
M: Ingo Molnar <[email protected]>
-M: Will Deacon <[email protected]>
+M: Will Deacon <[email protected]>
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
S: Maintained
@@ -10539,7 +10539,7 @@ F: arch/arm/boot/dts/mmp*
F: arch/arm/mach-mmp/
MMU GATHER AND TLB INVALIDATION
-M: Will Deacon <[email protected]>
+M: Will Deacon <[email protected]>
M: "Aneesh Kumar K.V" <[email protected]>
M: Andrew Morton <[email protected]>
M: Nick Piggin <[email protected]>
@@ -12029,7 +12029,7 @@ S: Maintained
F: drivers/pci/controller/dwc/*layerscape*
PCI DRIVER FOR GENERIC OF HOSTS
-M: Will Deacon <[email protected]>
+M: Will Deacon <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Maintained