libata: Separate out ata_dev_config_ncq_send_recv()

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 24997a7..a87defa 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7539,10 +7539,10 @@ M:      Michael Schmitz <schmitzmic@gmail.com>
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
 F:     Documentation/scsi/g_NCR5380.txt
+F:     Documentation/scsi/dtc3x80.txt
 F:     drivers/scsi/NCR5380.*
 F:     drivers/scsi/arm/cumana_1.c
 F:     drivers/scsi/arm/oak.c
-F:     drivers/scsi/atari_NCR5380.c
 F:     drivers/scsi/atari_scsi.*
 F:     drivers/scsi/dmx3191d.c
 F:     drivers/scsi/dtc.*
@@ -10595,6 +10595,14 @@ L:     linux-tegra@vger.kernel.org
 S:     Maintained
 F:     drivers/staging/nvec/
 
+STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
+M:     Jens Frederich <jfrederich@gmail.com>
+M:     Daniel Drake <dsd@laptop.org>
+M:     Jon Nettleton <jon.nettleton@gmail.com>
+W:     http://wiki.laptop.org/go/DCON
+S:     Maintained
+F:     drivers/staging/olpc_dcon/
+
 STAGING - REALTEK RTL8712U DRIVERS
 M:     Larry Finger <Larry.Finger@lwfinger.net>
 M:     Florian Schilhabel <florian.c.schilhabel@googlemail.com>.