diff --git a/[refs] b/[refs] index 15374739cded..db61ffc85209 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc4729826fd1a478f235fbcf58c0f97663f8d7e3 +refs/heads/master: 390beae4f843d4d2c4adfdedc1e3d633f9d3945f diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 216dbf3febb6..4e8ace8b9773 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -7313,6 +7313,18 @@ S: Maintained F: drivers/vlynq/vlynq.c F: include/linux/vlynq.h +VME SUBSYSTEM +M: Martyn Welch +M: Manohar Vanga +M: Greg Kroah-Hartman +L: devel@driverdev.osuosl.org +S: Maintained +T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git +F: Documentation/vme_api.txt +F: drivers/staging/vme/ +F: drivers/vme/ +F: include/linux/vme* + VMWARE VMXNET3 ETHERNET DRIVER M: Shreyas Bhatewara M: "VMware, Inc."