Merge branch 'for-next' of git://git.o-hand.com/linux-mfd

* 'for-next' of git://git.o-hand.com/linux-mfd:
  mfd: fix da903x warning
  mfd: fix MAINTAINERS entry
  mfd: Use the value of the final spin when reading the AUXADC
  mfd: Storage class should be before const qualifier
  mfd: PASIC3: supply clock_rate to DS1WM via driver_data
  mfd: remove DS1WM clock handling
  mfd: remove unused PASIC3 bus_shift field
  pxa/magician: remove deprecated .bus_shift from PASIC3 platform_data
  mfd: convert PASIC3 to use MFD core
  mfd: convert DS1WM to use MFD core
  mfd: Support active high IRQs on WM835x
  mfd: Use bulk read to fill WM8350 register cache
  mfd: remove duplicated #include from pcf50633

diff --combined MAINTAINERS
index 60c9706858334270f6673b352d001aae689d92b1,587bc8bd6f732dafd86e324ae44b2db018e4ef12..9673cd28a69b3049f1c9f7b5b3eda9aa279404d1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1422,11 -1422,6 +1422,11 @@@ P:    Doug Warzech
  M:    Douglas_Warzecha@dell.com
  S:    Maintained
  
 +DELL WMI EXTRAS DRIVER
 +P:    Matthew Garrett
 +M:    mjg59@srcf.ucam.org
 +S:    Maintained
 +
  DEVICE NUMBER REGISTRY
  P:    Torben Mathiasen
  M:    device@lanana.org
@@@ -2659,12 -2654,6 +2659,12 @@@ M:    jason.wessel@windriver.co
  L:    kgdb-bugreport@lists.sourceforge.net
  S:    Maintained
  
 +KMEMTRACE
 +P:    Eduard - Gabriel Munteanu
 +M:    eduard.munteanu@linux360.ro
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +
  KPROBES
  P:    Ananth N Mavinakayanahalli
  M:    ananth@in.ibm.com
@@@ -2935,12 -2924,6 +2935,12 @@@ M:    buytenh@marvell.co
  L:    netdev@vger.kernel.org
  S:    Supported
  
 +MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 +P:    Nicolas Pitre
 +M:    nico@cam.org
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +
  MARVELL YUKON / SYSKONNECT DRIVER
  P:    Mirko Lindner
  M:    mlindner@syskonnect.de
@@@ -3051,8 -3034,9 +3051,9 @@@ S:      Maintaine
  
  MULTIFUNCTION DEVICES (MFD)
  P:    Samuel Ortiz
- M:    sameo@openedhand.com
+ M:    sameo@linux.intel.com
  L:    linux-kernel@vger.kernel.org
+ T:    git kernel.org:/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
  S:    Supported
  
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
@@@ -3933,14 -3917,7 +3934,14 @@@ S:    Maintaine
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
  P:    Pierre Ossman
  M:    drzeus-sdhci@drzeus.cx
 -L:    sdhci-devel@list.drzeus.cx
 +L:    sdhci-devel@lists.ossman.eu
 +S:    Maintained
 +
 +SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
 +P:    Anton Vorontsov
 +M:    avorontsov@ru.mvista.com
 +L:    linuxppc-dev@ozlabs.org
 +L:    sdhci-devel@lists.ossman.eu
  S:    Maintained
  
  SECURITY SUBSYSTEM
@@@ -4406,7 -4383,10 +4407,7 @@@ T:     quilt http://svn.sourceforge.jp/svnr
  S:    Maintained
  
  TOSHIBA ACPI EXTRAS DRIVER
 -P:    John Belmonte
 -M:    toshiba_acpi@memebeam.org
 -W:    http://memebeam.org/toys/ToshibaAcpiDriver
 -S:    Maintained
 +S:    Orphan
  
  TOSHIBA SMM DRIVER
  P:    Jonathan Buzzard
@@@ -4415,11 -4395,6 +4416,11 @@@ L:    tlinux-users@tce.toshiba-dme.co.j
  W:    http://www.buzzard.org.uk/toshiba/
  S:    Maintained
  
 +TMIO MMC DRIVER
 +P:    Ian Molton
 +M:    ian@mnementh.co.uk
 +S:    Maintained
 +
  TPM DEVICE DRIVER
  P:    Debora Velarde
  M:    debora@linux.vnet.ibm.com