aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap3
-rw-r--r--MAINTAINERS10
2 files changed, 7 insertions, 6 deletions
diff --git a/.mailmap b/.mailmap
index edcac87e76c8..10b27ecb61c0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -196,7 +196,8 @@ Oleksij Rempel <[email protected]> <[email protected]>
Paolo 'Blaisorblade' Giarrusso <[email protected]>
Patrick Mochel <[email protected]>
Peter A Jonsson <[email protected]>
Peter Oruba <[email protected]>
Peter Oruba <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index a69e6db80c79..6c4dc607074a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3096,7 +3096,7 @@ S: Supported
F: arch/arm64/net/
BPF JIT for MIPS (32-BIT AND 64-BIT)
-M: Paul Burton <[email protected]>
+M: Paul Burton <[email protected]>
S: Maintained
@@ -8001,7 +8001,7 @@ S: Maintained
F: drivers/usb/atm/ueagle-atm.c
IMGTEC ASCII LCD DRIVER
-M: Paul Burton <[email protected]>
+M: Paul Burton <[email protected]>
S: Maintained
F: Documentation/devicetree/bindings/auxdisplay/img-ascii-lcd.txt
F: drivers/auxdisplay/img-ascii-lcd.c
@@ -10828,7 +10828,7 @@ F: drivers/usb/image/microtek.*
MIPS
M: Ralf Baechle <[email protected]>
-M: Paul Burton <[email protected]>
+M: Paul Burton <[email protected]>
M: James Hogan <[email protected]>
W: http://www.linux-mips.org/
@@ -10842,7 +10842,7 @@ F: arch/mips/
F: drivers/platform/mips/
MIPS BOSTON DEVELOPMENT BOARD
-M: Paul Burton <[email protected]>
+M: Paul Burton <[email protected]>
S: Maintained
F: Documentation/devicetree/bindings/clock/img,boston-clock.txt
@@ -10852,7 +10852,7 @@ F: drivers/clk/imgtec/clk-boston.c
F: include/dt-bindings/clock/boston-clock.h
MIPS GENERIC PLATFORM
-M: Paul Burton <[email protected]>
+M: Paul Burton <[email protected]>
S: Supported
F: Documentation/devicetree/bindings/power/mti,mips-cpc.txt