aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap3
-rw-r--r--MAINTAINERS17
2 files changed, 9 insertions, 11 deletions
diff --git a/.mailmap b/.mailmap
index e4c8f09525f5..745b6ec64d72 100644
--- a/.mailmap
+++ b/.mailmap
@@ -104,6 +104,9 @@ James E Wilson <[email protected]>
James Ketrenos <jketreno@io.(none)>
diff --git a/MAINTAINERS b/MAINTAINERS
index 4bd6380d8ae6..6cfe90186df2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3704,8 +3704,7 @@ S: Maintained
F: drivers/net/wireless/ath/carl9170/
CAVIUM I2C DRIVER
-M: Jan Glauber <[email protected]>
-M: David Daney <[email protected]>
+M: Robert Richter <[email protected]>
W: http://www.cavium.com
S: Supported
F: drivers/i2c/busses/i2c-octeon*
@@ -3721,9 +3720,7 @@ S: Supported
F: drivers/net/ethernet/cavium/liquidio/
CAVIUM MMC DRIVER
-M: Jan Glauber <[email protected]>
-M: David Daney <[email protected]>
-M: Steven J. Hill <[email protected]>
+M: Robert Richter <[email protected]>
W: http://www.cavium.com
S: Supported
F: drivers/mmc/host/cavium*
@@ -5833,15 +5830,14 @@ F: drivers/edac/highbank*
EDAC-CAVIUM OCTEON
M: Ralf Baechle <[email protected]>
-M: David Daney <[email protected]>
+M: Robert Richter <[email protected]>
S: Supported
F: drivers/edac/octeon_edac*
EDAC-CAVIUM THUNDERX
-M: David Daney <[email protected]>
-M: Jan Glauber <[email protected]>
+M: Robert Richter <[email protected]>
S: Supported
F: drivers/edac/thunderx_edac*
@@ -12622,7 +12618,7 @@ F: Documentation/devicetree/bindings/pci/axis,artpec*
F: drivers/pci/controller/dwc/*artpec*
PCIE DRIVER FOR CAVIUM THUNDERX
-M: David Daney <[email protected]>
+M: Robert Richter <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Supported
@@ -16130,7 +16126,7 @@ S: Maintained
F: drivers/net/thunderbolt.c
THUNDERX GPIO DRIVER
-M: David Daney <[email protected]>
+M: Robert Richter <[email protected]>
S: Maintained
F: drivers/gpio/gpio-thunderx.c
@@ -17903,7 +17899,6 @@ F: drivers/char/xillybus/
XLP9XX I2C DRIVER
M: George Cherian <[email protected]>
-M: Jan Glauber <[email protected]>
W: http://www.cavium.com
S: Supported