1 files changed, 11 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 33ecf266570f..5f91365ebc0d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7201,6 +7201,7 @@ S:	Supported
 F:      Documentation/s390/kvm.txt
 F:      arch/s390/include/asm/kvm*
 F:      arch/s390/kvm/
+F:      arch/s390/mm/gmap.c
 KERNEL VIRTUAL MACHINE (KVM) FOR ARM
 M:      Christoffer Dall <christoffer.dall@linaro.org>
@@ -10896,6 +10897,16 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 F:      drivers/iommu/s390-iommu.c
+S390 VFIO-CCW DRIVER
+M:      Cornelia Huck <cornelia.huck@de.ibm.com>
+M:      Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
+L:      linux-s390@vger.kernel.org
+L:      kvm@vger.kernel.org
+S:      Supported
+F:      drivers/s390/cio/vfio_ccw*
+F:      Documentation/s390/vfio-ccw.txt
+F:      include/uapi/linux/vfio_ccw.h
 S3C24XX SD/MMC Driver
 M:      Ben Dooks <ben-linux@fluff.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)