aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-20 17:49:29 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-20 17:49:29 -0400
commitc9ab09710ecb071031b0a04f3f9d7e686c0a75e0 (patch)
tree4c270fb2390392d44426ab7551f0fa0215e1def4 /MAINTAINERS
parentff9144530e9cfe8923e00172e3f8ff83c3b8ff8b (diff)
parent12223dabc617a4babfba4e17feb1ed88e8cfeb8f (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
* master.kernel.org:/home/rmk/linux-2.6-mmc: [MMC] Add (MMC) to entry in MAINTAINERS file [MMC] sdhci truncated pointer fix
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1421f74b6009..854a152e5e95 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1895,7 +1895,7 @@ L: linux-kernel@vger.kernel.org
1895W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html 1895W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
1896S: Maintained 1896S: Maintained
1897 1897
1898MULTIMEDIA CARD SUBSYSTEM 1898MULTIMEDIA CARD (MMC) SUBSYSTEM
1899P: Russell King 1899P: Russell King
1900M: rmk+mmc@arm.linux.org.uk 1900M: rmk+mmc@arm.linux.org.uk
1901S: Maintained 1901S: Maintained