summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CREDITS4
-rw-r--r--MAINTAINERS7
2 files changed, 6 insertions, 5 deletions
diff --git a/CREDITS b/CREDITS
index 84793a967a0b..091412875a66 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1503,6 +1503,10 @@ N: Andy Gross
E: agross@kernel.org
D: Qualcomm SoC subsystem and drivers
+N: Mark Gross
+E: markgross@kernel.org
+D: x86/mellanox platform maintenance and various x86 specific drivers
+
N: Grant Grundler
E: grantgrundler@gmail.com
W: http://obmouse.sourceforge.net/
diff --git a/MAINTAINERS b/MAINTAINERS
index 7b37c88143f6..f16c09f76e7b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9337,9 +9337,8 @@ S: Supported
F: drivers/edac/dmc520_edac.c
EDAC-E752X
-M: Mark Gross <markgross@kernel.org>
L: linux-edac@vger.kernel.org
-S: Maintained
+S: Orphan
F: drivers/edac/e752x_edac.c
EDAC-E7XXX
@@ -13201,7 +13200,6 @@ F: drivers/crypto/intel/keembay/ocs-aes.h
INTEL KEEM BAY OCS ECC CRYPTO DRIVER
M: Prabhjot Khurana <prabhjot.khurana@intel.com>
-M: Mark Gross <mgross@linux.intel.com>
S: Maintained
F: Documentation/devicetree/bindings/crypto/intel,keembay-ocs-ecc.yaml
F: drivers/crypto/intel/keembay/Kconfig
@@ -26642,8 +26640,7 @@ S: Maintained
F: drivers/net/ethernet/tehuti/tn40*
TELECOM CLOCK DRIVER FOR MCPL0010
-M: Mark Gross <markgross@kernel.org>
-S: Supported
+S: Orphan
F: drivers/char/tlclk.c
TEMPO SEMICONDUCTOR DRIVERS