aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-05 19:22:43 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-05 19:22:43 -0400
commit2f9c3c2c24af5f2e6061756d6fc04fdf66f41106 (patch)
tree692c71cf8e5fbc5d9fa29b56e1b08d9ea124ddda /MAINTAINERS
parent1b41526975d8318ca17c93f724893884d03a0560 (diff)
parent092d01e260da628b01d4229c31a296111e3cd97a (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Prevent au1xmmc.c breakage on non-Au1200 Alchemy [MMC] Add maintainers entry for MMC subsystem
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 141c22269eba..c3c5842402df 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1889,6 +1889,11 @@ L: linux-kernel@vger.kernel.org
1889W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html 1889W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
1890S: Maintained 1890S: Maintained
1891 1891
1892MULTIMEDIA CARD SUBSYSTEM
1893P: Russell King
1894M: rmk+mmc@arm.linux.org.uk
1895S: Maintained
1896
1892MULTISOUND SOUND DRIVER 1897MULTISOUND SOUND DRIVER
1893P: Andrew Veliath 1898P: Andrew Veliath
1894M: andrewtv@usa.net 1899M: andrewtv@usa.net