summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-20 14:49:29 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-20 14:49:29 -0700
commitc9ab09710ecb071031b0a04f3f9d7e686c0a75e0 (patch)
tree4c270fb2390392d44426ab7551f0fa0215e1def4 /MAINTAINERS
parentff9144530e9cfe8923e00172e3f8ff83c3b8ff8b (diff)
parent12223dabc617a4babfba4e17feb1ed88e8cfeb8f (diff)
downloadlinux-3.10-c9ab09710ecb071031b0a04f3f9d7e686c0a75e0.tar.gz
linux-3.10-c9ab09710ecb071031b0a04f3f9d7e686c0a75e0.tar.bz2
linux-3.10-c9ab09710ecb071031b0a04f3f9d7e686c0a75e0.zip
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 1421f74b600..854a152e5e9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1895,7 +1895,7 @@ L: linux-kernel@vger.kernel.org
W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
S: Maintained
-MULTIMEDIA CARD SUBSYSTEM
+MULTIMEDIA CARD (MMC) SUBSYSTEM
P: Russell King
M: rmk+mmc@arm.linux.org.uk
S: Maintained