IB/mthca: Fix PRM compliance problem in atomic-send completions

[linux-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d5a97d3e23c385174c3aac9517e1d6be5a5351f8..0f6d13bd4688fc6a11a471dba16e3a1401837765 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -532,13 +532,13 @@ L:        netdev@vger.kernel.org
 S:     Maintained
 
 ASUS ACPI EXTRAS DRIVER
+P:     Corentin Chary
+M:     corentincj@iksaif.net
 P:     Karol Kozimor
 M:     sziwan@users.sourceforge.net
-P:     Julien Lerouge
-M:     julien.lerouge@free.fr
 L:     acpi4asus-user@lists.sourceforge.net
 W:     http://sourceforge.net/projects/acpi4asus
-W:     http://julien.lerouge.free.fr
+W:     http://xf.iksaif.net/acpi4asus
 S:     Maintained
 
 ATA OVER ETHERNET DRIVER
@@ -1564,10 +1564,9 @@ T:       git kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git
 S:     Maintained
 
 IDE/ATAPI CDROM DRIVER
-P:     Jens Axboe
-M:     axboe@kernel.dk
-L:     linux-kernel@vger.kernel.org
-W:     http://www.kernel.dk
+P:     Alan Cox
+M:     alan@lxorguk.ukuu.org.uk
+L:     linux-ide@vger.kernel.org
 S:     Maintained
 
 IDE/ATAPI FLOPPY DRIVERS