diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 10:48:20 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 10:48:20 -0700 |
commit | 14dc5249728ff699b1ca4dac01ad416a350a147a (patch) | |
tree | 4ffd91101601f55c5e0b53a00f03534b7e044ac4 /MAINTAINERS | |
parent | 02b2318e07f98a7cdf7089a4457a8d62424aa824 (diff) | |
parent | bcd4f3acbaec102e2b8000c977ecc38dcd0fe367 (diff) | |
download | linux-3.10-14dc5249728ff699b1ca4dac01ad416a350a147a.tar.gz linux-3.10-14dc5249728ff699b1ca4dac01ad416a350a147a.tar.bz2 linux-3.10-14dc5249728ff699b1ca4dac01ad416a350a147a.zip |
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
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index da9e60a71e3..5abec1435ad 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 |