summary refs log tree commit diff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-12-14 14:56:21 -0500
committerDoug Ledford <dledford@redhat.com>2016-12-14 14:56:21 -0500
commit6f94ba20799b98c8badf047b184fb4cd7bc45e44 (patch)
tree41d55a0005cd2e0b27a110f3e70b342f9426f668 /MAINTAINERS
parent9032ad78bb58f2567fc95125ee69cde7b74c0a21 (diff)
parent29c8d9eba550c6d73d17cc1618a9f5f2a7345aa1 (diff)
downloadlinux-6f94ba20799b98c8badf047b184fb4cd7bc45e44.tar.gz
Merge branch 'vmw_pvrdma' into merge-test
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4e4349abc07f..2c7a7b6ba7bf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12924,6 +12924,13 @@ S:	Maintained
 F:	drivers/scsi/vmw_pvscsi.c
 F:	drivers/scsi/vmw_pvscsi.h
 
+VMWARE PVRDMA DRIVER
+M:	Adit Ranadive <aditr@vmware.com>
+M:	VMware PV-Drivers <pv-drivers@vmware.com>
+L:	linux-rdma@vger.kernel.org
+S:	Maintained
+F:	drivers/infiniband/hw/vmw_pvrdma/
+
 VOLTAGE AND CURRENT REGULATOR FRAMEWORK
 M:	Liam Girdwood <lgirdwood@gmail.com>
 M:	Mark Brown <broonie@kernel.org>