diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 16:44:18 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 16:44:18 -0400 |
commit | 0df55ea55bf1f4827115af4740899980b4fce77f (patch) | |
tree | 1392b2c4b8d6758af933cc56586bb1396db7f3f3 /MAINTAINERS | |
parent | c1f792a5bfebcf7ee1d739c3cb9baeaede0160e7 (diff) | |
parent | d1057c40682990d29d4ee93d6ffd9836043552e6 (diff) |
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: (78 commits)
mmc: MAINTAINERS: add myself as a tmio-mmc maintainer
mmc: print debug messages for runtime PM actions
mmc: fix runtime PM with -ENOSYS suspend case
mmc: at91_mci: move register header from include/ to drivers/
mmc: mxs-mmc: fix clock rate setting
mmc: tmio: fix a deadlock
mmc: tmio: fix a recently introduced bug in DMA code
mmc: sh_mmcif: maximize power saving
mmc: tmio: maximize power saving
mmc: tmio: fix recursive spinlock, don't schedule with interrupts disabled
mmc: Added quirks for Ricoh 1180:e823 lower base clock frequency
mmc: omap_hsmmc: fix oops in omap_hsmmc_dma_cb()
mmc: omap_hsmmc: refactor duplicated code
mmc: omap_hsmmc: fix a few bugs when setting the clock divisor
mmc: omap_hsmmc: introduce start_clock and re-use stop_clock
mmc: omap_hsmmc: split duplicate code to calc_divisor() function
mmc: omap_hsmmc: move hardcoded frequency constants to defines
mmc: omap_hsmmc: correct debug report error status mnemonics
mmc: block: fixed NULL pointer dereference
mmc: documentation of mmc non-blocking request usage and design.
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 72b979d5076b..789fed662140 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4585,9 +4585,8 @@ S: Maintained | |||
4585 | F: drivers/mmc/host/omap.c | 4585 | F: drivers/mmc/host/omap.c |
4586 | 4586 | ||
4587 | OMAP HS MMC SUPPORT | 4587 | OMAP HS MMC SUPPORT |
4588 | M: Madhusudhan Chikkature <madhu.cr@ti.com> | ||
4589 | L: linux-omap@vger.kernel.org | 4588 | L: linux-omap@vger.kernel.org |
4590 | S: Maintained | 4589 | S: Orphan |
4591 | F: drivers/mmc/host/omap_hsmmc.c | 4590 | F: drivers/mmc/host/omap_hsmmc.c |
4592 | 4591 | ||
4593 | OMAP RANDOM NUMBER GENERATOR SUPPORT | 4592 | OMAP RANDOM NUMBER GENERATOR SUPPORT |
@@ -6243,9 +6242,14 @@ F: drivers/char/toshiba.c | |||
6243 | F: include/linux/toshiba.h | 6242 | F: include/linux/toshiba.h |
6244 | 6243 | ||
6245 | TMIO MMC DRIVER | 6244 | TMIO MMC DRIVER |
6245 | M: Guennadi Liakhovetski <g.liakhovetski@gmx.de> | ||
6246 | M: Ian Molton <ian@mnementh.co.uk> | 6246 | M: Ian Molton <ian@mnementh.co.uk> |
6247 | L: linux-mmc@vger.kernel.org | ||
6247 | S: Maintained | 6248 | S: Maintained |
6248 | F: drivers/mmc/host/tmio_mmc.* | 6249 | F: drivers/mmc/host/tmio_mmc* |
6250 | F: drivers/mmc/host/sh_mobile_sdhi.c | ||
6251 | F: include/linux/mmc/tmio.h | ||
6252 | F: include/linux/mmc/sh_mobile_sdhi.h | ||
6249 | 6253 | ||
6250 | TMPFS (SHMEM FILESYSTEM) | 6254 | TMPFS (SHMEM FILESYSTEM) |
6251 | M: Hugh Dickins <hughd@google.com> | 6255 | M: Hugh Dickins <hughd@google.com> |