diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 13:48:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 13:48:20 -0400 |
commit | 14dc5249728ff699b1ca4dac01ad416a350a147a (patch) | |
tree | 4ffd91101601f55c5e0b53a00f03534b7e044ac4 /MAINTAINERS | |
parent | 02b2318e07f98a7cdf7089a4457a8d62424aa824 (diff) | |
parent | bcd4f3acbaec102e2b8000c977ecc38dcd0fe367 (diff) |
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 da9e60a71e3a..5abec1435ad8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2613,12 +2613,6 @@ M: yokota@netlab.is.tsukuba.ac.jp | |||
2613 | W: http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/ | 2613 | W: http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/ |
2614 | S: Maintained | 2614 | S: Maintained |
2615 | 2615 | ||
2616 | NON-IDE/NON-SCSI CDROM DRIVERS [GENERAL] (come on, crew - mark your responsibility) | ||
2617 | P: Eberhard Moenkeberg | ||
2618 | M: emoenke@gwdg.de | ||
2619 | L: linux-kernel@vger.kernel.org | ||
2620 | S: Maintained | ||
2621 | |||
2622 | NTFS FILESYSTEM | 2616 | NTFS FILESYSTEM |
2623 | P: Anton Altaparmakov | 2617 | P: Anton Altaparmakov |
2624 | M: aia21@cantab.net | 2618 | M: aia21@cantab.net |
@@ -3105,12 +3099,6 @@ M: michael@mihu.de | |||
3105 | W: http://www.mihu.de/linux/saa7146 | 3099 | W: http://www.mihu.de/linux/saa7146 |
3106 | S: Maintained | 3100 | S: Maintained |
3107 | 3101 | ||
3108 | SBPCD CDROM DRIVER | ||
3109 | P: Eberhard Moenkeberg | ||
3110 | M: emoenke@gwdg.de | ||
3111 | L: linux-kernel@vger.kernel.org | ||
3112 | S: Maintained | ||
3113 | |||
3114 | SC1200 WDT DRIVER | 3102 | SC1200 WDT DRIVER |
3115 | P: Zwane Mwaikambo | 3103 | P: Zwane Mwaikambo |
3116 | M: zwane@arm.linux.org.uk | 3104 | M: zwane@arm.linux.org.uk |