diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-27 12:27:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-27 12:27:00 -0700 |
| commit | 65097561b91c4f8ce92a2905f150900f1779ccd1 (patch) | |
| tree | 10928f1396e077b96dbba1f93417248145561e23 /MAINTAINERS | |
| parent | 9a457a524762edc1bb1ded65b7a75c01738632d5 (diff) | |
| parent | 9320f7cbbdd5febf013b0e91db29189724057738 (diff) | |
| download | linux-65097561b91c4f8ce92a2905f150900f1779ccd1.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
mmc: sdhci-s3c: fix NULL ptr access in sdhci_s3c_remove
mmc: sdhci-s3c: fix incorrect spinlock usage after merge
mmc: MAINTAINERS: add myself as MMC maintainer
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ceba39bc1b49..668682d1f5fa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3925,8 +3925,10 @@ S: Supported F: drivers/mfd/ MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM -S: Orphan +M: Chris Ball <cjb@laptop.org> L: linux-mmc@vger.kernel.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git +S: Maintained F: drivers/mmc/ F: include/linux/mmc/ @@ -5097,8 +5099,10 @@ S: Maintained F: drivers/mmc/host/sdricoh_cs.c SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER -S: Orphan +M: Chris Ball <cjb@laptop.org> L: linux-mmc@vger.kernel.org +T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git +S: Maintained F: drivers/mmc/host/sdhci.* SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF) |