summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CREDITS8
-rw-r--r--MAINTAINERS5
2 files changed, 9 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index f33a33fd2371..ba6eb6274f8b 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3916,6 +3916,10 @@ S: 21513 Conradia Ct
S: Cupertino, CA 95014
S: USA
+N: Manohar Vanga
+E: manohar.vanga@gmail.com
+D: VME subsystem maintainer
+
N: Thibaut Varène
E: hacks+kernel@slashdirt.org
W: http://hacks.slashdirt.org/
@@ -4016,6 +4020,10 @@ D: Fixes for the NE/2-driver
D: Miscellaneous MCA-support
D: Cleanup of the Config-files
+N: Martyn Welch
+E: martyn@welchs.me.uk
+D: VME subsystem maintainer
+
N: Matt Welsh
E: mdw@metalab.unc.edu
W: http://www.cs.berkeley.edu/~mdw
diff --git a/MAINTAINERS b/MAINTAINERS
index ea790149af79..ff083d120014 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -23234,11 +23234,8 @@ F: include/linux/vmalloc.h
F: mm/vmalloc.c
VME SUBSYSTEM
-M: Martyn Welch <martyn@welchs.me.uk>
-M: Manohar Vanga <manohar.vanga@gmail.com>
-M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
L: linux-kernel@vger.kernel.org
-S: Odd fixes
+S: Orphan
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
F: Documentation/driver-api/vme.rst
F: drivers/staging/vme_user/