aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS4
2 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index adfed592f88b..d3eb862f71ab 100644
--- a/.mailmap
+++ b/.mailmap
@@ -328,6 +328,7 @@ Maxime Ripard <[email protected]> <[email protected]>
Mayuresh Janorkar <[email protected]>
Michael Buesch <[email protected]>
Michel Dänzer <[email protected]>
Michel Lespinasse <[email protected]>
Michel Lespinasse <[email protected]> <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 32772c383ab7..51f7682246be 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3036,7 +3036,7 @@ F: drivers/video/fbdev/wm8505fb*
F: drivers/video/fbdev/wmt_ge_rops.*
ARM/ZYNQ ARCHITECTURE
-M: Michal Simek <[email protected]>
+M: Michal Simek <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Supported
W: http://wiki.xilinx.com
@@ -23084,7 +23084,7 @@ F: drivers/net/can/xilinx_can.c
XILINX GPIO DRIVER
M: Shubhrajyoti Datta <[email protected]>
R: Srinivas Neeli <[email protected]>
-R: Michal Simek <[email protected]>
+R: Michal Simek <[email protected]>
S: Maintained
F: Documentation/devicetree/bindings/gpio/xlnx,gpio-xilinx.yaml
F: Documentation/devicetree/bindings/gpio/gpio-zynq.yaml