Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[linux-drm-fsl-dcu.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bf9fa6d7af13c794c8582383ffc4a64264cc3f22..0f6d13bd4688fc6a11a471dba16e3a1401837765 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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