Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[mv-sheeva.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a64f2920a8f3fd37564e76d3744acd70d17506d6..068f5fb900209102a96e99d79a0adcece8238d6c 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2202,25 +2202,12 @@ L:      linux-ide@vger.kernel.org
 T:     quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
 S:     Maintained
 
-IDE/ATAPI CDROM DRIVER
+IDE/ATAPI DRIVERS
 P:     Borislav Petkov
 M:     petkovbb@gmail.com
 L:     linux-ide@vger.kernel.org
 S:     Maintained
 
-IDE/ATAPI FLOPPY DRIVERS
-P:     Paul Bristow
-M:     Paul Bristow <paul@paulbristow.net>
-W:     http://paulbristow.net/linux/idefloppy.html
-L:     linux-kernel@vger.kernel.org
-S:     Maintained
-
-IDE/ATAPI TAPE DRIVERS
-P:     Gadi Oxman
-M:     Gadi Oxman <gadio@netvision.net.il>
-L:     linux-kernel@vger.kernel.org
-S:     Maintained
-
 IDLE-I7300
 P:     Andy Henroid
 M:     andrew.d.henroid@intel.com