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

diff --combined MAINTAINERS
index 5740aa216e1170398c7ead134ee0902da11c760d,1f81b4e21697e375f3b13fee0b7a2c08ffd0034a..c40f0ae965523a04ef327be9c13c97923e67fb6c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -202,13 -202,6 +202,13 @@@ L:       linux-scsi@vger.kernel.or
  W:    http://www.adaptec.com/
  S:    Supported
  
 +ACER WMI LAPTOP EXTRAS
 +P:    Carlos Corbacho
 +M:    carlos@strangeworlds.co.uk
 +L:    aceracpi@googlegroups.com (subscribers-only)
 +W:    http://code.google.com/p/aceracpi
 +S:    Maintained
 +
  ACPI
  P:    Len Brown
  M:    len.brown@intel.com
@@@ -259,13 -252,6 +259,13 @@@ L:       linux-acpi@vger.kernel.or
  W:    http://acpi.sourceforge.net/
  S:    Supported
  
 +ACPI WMI DRIVER
 +P:      Carlos Corbacho
 +M:      carlos@strangeworlds.co.uk
 +L:      linux-acpi@vger.kernel.org
 +W:      http://www.lesswatts.org/projects/acpi/
 +S:      Maintained
 +
  ADM1025 HARDWARE MONITOR DRIVER
  P:    Jean Delvare
  M:    khali@linux-fr.org
@@@ -688,12 -674,6 +688,12 @@@ W:       http://www.atmel.com/products/AT91
  W:    http://www.at91.com/
  S:    Maintained
  
 +ATMEL AT91 / AT32 SERIAL DRIVER
 +P:    Haavard Skinnemoen
 +M:    hskinnemoen@atmel.com
 +L:    linux-kernel@vger.kernel.org
 +S:    Supported
 +
  ATMEL LCDFB DRIVER
  P:    Nicolas Ferre
  M:    nicolas.ferre@atmel.com
@@@ -1173,8 -1153,6 +1173,8 @@@ S:      Orpha
  CRIS PORT
  P:    Mikael Starvik
  M:    starvik@axis.com
 +P:    Jesper Nilsson
 +M:    jesper.nilsson@axis.com
  L:    dev-etrax@axis.com
  W:    http://developer.axis.com
  S:    Maintained
@@@ -1393,11 -1371,6 +1393,11 @@@ W:    http://linuxtv.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
  S:    Maintained
  
 +DZ DECSTATION DZ11 SERIAL DRIVER
 +P:    Maciej W. Rozycki
 +M:    macro@linux-mips.org
 +S:    Maintained
 +
  EATA-DMA SCSI DRIVER
  P:    Michael Neuffer
  L:    linux-eata@i-connect.net, linux-scsi@vger.kernel.org
@@@ -1812,11 -1785,6 +1812,11 @@@ P:    Jaroslav Kysel
  M:    perex@perex.cz
  S:    Maintained
  
 +HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
 +P:    Carlos Corbacho
 +M:    carlos@strangeworlds.co.uk
 +S:    Odd Fixes
 +
  HPET: High Precision Event Timers driver (hpet.c)
  P:    Clemens Ladisch
  M:    clemens@ladisch.de
@@@ -2158,14 -2126,6 +2158,14 @@@ M:    acme@ghostprotocols.ne
  L:    netdev@vger.kernel.org
  S:    Maintained
  
 +IPWIRELES DRIVER
 +P:    Jiri Kosina
 +M:    jkosina@suse.cz
 +P:    David Sterba
 +M:    dsterba@suse.cz
 +S:    Maintained
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
 +
  IRDA SUBSYSTEM
  P:    Samuel Ortiz
  M:    samuel@sortiz.org
@@@ -2622,15 -2582,6 +2622,15 @@@ L:    linux-kernel@vger.kernel.or
  W:    http://www.linux-mm.org
  S:    Maintained
  
 +MEI MN10300/AM33 PORT
 +P:    David Howells
 +M:    dhowells@redhat.com
 +P:    Koichi Yasutake
 +M:    yasutake.koichi@jp.panasonic.com
 +L:    linux-am33-list@redhat.com
 +W:    ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
 +S:    Maintained
 +
  MEMORY TECHNOLOGY DEVICES (MTD)
  P:    David Woodhouse
  M:    dwmw2@infradead.org
@@@ -2682,7 -2633,6 +2682,6 @@@ MOTOROLA IMX MMC/SD HOST CONTROLLER INT
  P:    Pavel Pisa
  M:    ppisa@pikron.com
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
- W:    http://mmc.drzeus.cx/wiki/Controllers/Freescale/SDHC
  S:    Maintained
  
  MOUSE AND MISC DEVICES [GENERAL]
@@@ -3262,11 -3212,6 +3261,11 @@@ W:    http://rt2x00.serialmonkey.com
  S:    Maintained
  F:    drivers/net/wireless/rt2x00/
  
 +RAMDISK RAM BLOCK DEVICE DRIVER
 +P:    Nick Piggin
 +M:    npiggin@suse.de
 +S:    Maintained
 +
  RANDOM NUMBER DRIVER
  P:    Matt Mackall
  M:    mpm@selenic.com
@@@ -3627,13 -3572,6 +3626,13 @@@ L:    linux-acpi@vger.kernel.or
  W:    http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
  S:    Maintained
  
 +SONY MEMORYSTICK CARD SUPPORT
 +P:    Alex Dubov
 +M:    oakad@yahoo.com
 +L:    linux-kernel@vger.kernel.org
 +W:    http://tifmxx.berlios.de/
 +S:    Maintained
 +
  SOUND
  P:    Jaroslav Kysela
  M:    perex@perex.cz
@@@ -3716,7 -3654,6 +3715,6 @@@ SECURE DIGITAL HOST CONTROLLER INTERFAC
  P:    Pierre Ossman
  M:    drzeus-sdhci@drzeus.cx
  L:    sdhci-devel@list.drzeus.cx
- W:    http://mmc.drzeus.cx/wiki/Linux/Drivers/sdhci
  S:    Maintained
  
  SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS
@@@ -3910,8 -3847,8 +3908,8 @@@ L:      linux-scsi@vger.kernel.or
  S:    Maintained
  
  UDF FILESYSTEM
 -P:    Ben Fennema
 -M:    bfennema@falcon.csc.calpoly.edu
 +P:    Jan Kara
 +M:    jack@suse.cz
  W:    http://linux-udf.sourceforge.net
  S:    Maintained
  
@@@ -4286,7 -4223,6 +4284,6 @@@ W83L51xD SD/MMC CARD INTERFACE DRIVE
  P:    Pierre Ossman
  M:    drzeus-wbsd@drzeus.cx
  L:    linux-kernel@vger.kernel.org
- W:    http://projects.drzeus.cx/wbsd
  S:    Maintained
  
  WATCHDOG DEVICE DRIVERS