Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
  splice: direct splicing updates ppos twice
  more ACSI removal
  umem: Fix match of pci_ids in umem driver
  umem: Remove references to dead CONFIG_MM_MAP_MEMORY variable
  remove the documentation for the legacy CDROM drivers

1 files changed, 0 insertions, 12 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index da9e60a71e3a..5abec1435ad8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2613,12 +2613,6 @@ M:	yokota@netlab.is.tsukuba.ac.jp
 W:      http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
 S:      Maintained
 
-NON-IDE/NON-SCSI CDROM DRIVERS [GENERAL] (come on, crew - mark your responsibility)
-P:      Eberhard Moenkeberg
-M:      emoenke@gwdg.de
-L:      linux-kernel@vger.kernel.org
-S:      Maintained
-
 NTFS FILESYSTEM
 P:      Anton Altaparmakov
 M:      aia21@cantab.net
@@ -3105,12 +3099,6 @@ M:	michael@mihu.de
 W:      http://www.mihu.de/linux/saa7146
 S:      Maintained
 
-SBPCD CDROM DRIVER
-P:      Eberhard Moenkeberg
-M:      emoenke@gwdg.de
-L:      linux-kernel@vger.kernel.org
-S:      Maintained
-
 SC1200 WDT DRIVER
 P:      Zwane Mwaikambo
 M:      zwane@arm.linux.org.uk