diff --git a/[refs] b/[refs]
index a05ad38bb7cd..39889cc8396a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd215237d2c2c1efb501f70be8e9ed1f81f3c068
+refs/heads/master: ca025282e9f13471cd4bf44d854bbd6dcbcb39c1
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 50d29bc9688b..38d11f682c5e 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -1877,10 +1877,8 @@ T:	quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
 S:	Maintained
 
 IDE/ATAPI CDROM DRIVER
-P:	Alan Cox
-M:	alan@lxorguk.ukuu.org.uk
 L:	linux-ide@vger.kernel.org
-S:	Maintained
+S:	Unmaintained
 
 IDE/ATAPI FLOPPY DRIVERS
 P:	Paul Bristow