diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-09 14:12:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-09 14:12:15 -0500 |
| commit | 5b39dba5029108800b94a5f4f96e3a05417103ac (patch) | |
| tree | 7d5c59fd124a776508b3e2a58efb093cd97b29ea /MAINTAINERS | |
| parent | 11eb3b0da3f8e4b9a6da6aba510471918239153d (diff) | |
| parent | 882c49164d72c45f37d7fa1bb3de7c31cf1a5fab (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
mmc: extend ricoh_mmc to support Ricoh RL5c476
at91_mci: use generic GPIO calls
sdhci: add num index for multi controllers case
MAINTAINERS: remove non-existant URLs
mmc: remove sdhci and mmc_spi experimental markers
mmc: Handle suspend/resume in Ricoh MMC disabler
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5740aa216e1..c40f0ae9655 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2682,7 +2682,6 @@ MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER | |||
| 2682 | P: Pavel Pisa | 2682 | P: Pavel Pisa |
| 2683 | M: ppisa@pikron.com | 2683 | M: ppisa@pikron.com |
| 2684 | L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) | 2684 | L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) |
| 2685 | W: http://mmc.drzeus.cx/wiki/Controllers/Freescale/SDHC | ||
| 2686 | S: Maintained | 2685 | S: Maintained |
| 2687 | 2686 | ||
| 2688 | MOUSE AND MISC DEVICES [GENERAL] | 2687 | MOUSE AND MISC DEVICES [GENERAL] |
| @@ -3716,7 +3715,6 @@ SECURE DIGITAL HOST CONTROLLER INTERFACE DRIVER | |||
| 3716 | P: Pierre Ossman | 3715 | P: Pierre Ossman |
| 3717 | M: drzeus-sdhci@drzeus.cx | 3716 | M: drzeus-sdhci@drzeus.cx |
| 3718 | L: sdhci-devel@list.drzeus.cx | 3717 | L: sdhci-devel@list.drzeus.cx |
| 3719 | W: http://mmc.drzeus.cx/wiki/Linux/Drivers/sdhci | ||
| 3720 | S: Maintained | 3718 | S: Maintained |
| 3721 | 3719 | ||
| 3722 | SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS | 3720 | SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS |
| @@ -4286,7 +4284,6 @@ W83L51xD SD/MMC CARD INTERFACE DRIVER | |||
| 4286 | P: Pierre Ossman | 4284 | P: Pierre Ossman |
| 4287 | M: drzeus-wbsd@drzeus.cx | 4285 | M: drzeus-wbsd@drzeus.cx |
| 4288 | L: linux-kernel@vger.kernel.org | 4286 | L: linux-kernel@vger.kernel.org |
| 4289 | W: http://projects.drzeus.cx/wbsd | ||
| 4290 | S: Maintained | 4287 | S: Maintained |
| 4291 | 4288 | ||
| 4292 | WATCHDOG DEVICE DRIVERS | 4289 | WATCHDOG DEVICE DRIVERS |