Merge branch 'fixes' into features

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 69a2935..f38461b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16817,8 +16817,8 @@ F:      drivers/video/fbdev/savage/
 S390
 M:     Heiko Carstens <hca@linux.ibm.com>
 M:     Vasily Gorbik <gor@linux.ibm.com>
-M:     Christian Borntraeger <borntraeger@linux.ibm.com>
-R:     Alexander Gordeev <agordeev@linux.ibm.com>
+M:     Alexander Gordeev <agordeev@linux.ibm.com>
+R:     Christian Borntraeger <borntraeger@linux.ibm.com>
 R:     Sven Schnelle <svens@linux.ibm.com>
 L:     linux-s390@vger.kernel.org
 S:     Supported
@@ -16893,9 +16893,7 @@ L:      linux-s390@vger.kernel.org
 S:     Supported
 W:     http://www.ibm.com/developerworks/linux/linux390/
 F:     Documentation/s390/vfio-ap.rst
-F:     drivers/s390/crypto/vfio_ap_drv.c
-F:     drivers/s390/crypto/vfio_ap_ops.c
-F:     drivers/s390/crypto/vfio_ap_private.h
+F:     drivers/s390/crypto/vfio_ap*
 
 S390 VFIO-CCW DRIVER
 M:     Eric Farman <farman@linux.ibm.com>