Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: (26 commits)
  mfd: Fix warning in WM8350
  mfd: Add placeholders for WM8350 client devices
  da903x: add regulator support for DA9030/DA9034
  mfd: Add WM8350 subdevice registration helper
  regulator: Add WM8350 regulator support
  mfd: Add WM8350 interrupt support
  mfd: Add initialisation callback for WM8350
  mfd: Add GPIO pin configuration support for WM8350
  mfd: Add I2C control support for WM8350
  mfd: Core support for the WM8350 AudioPlus PMIC
  mfd: Add WM8350 watchdog register definitions
  mfd: Add WM8350 RTC register definitions
  mfd: Add WM8350 comparator register definitions
  mfd: Add WM8350 PMU register definitions
  mfd: Add WM8350 PMIC register definitions
  mfd: Add WM8350 GPIO register definitions
  mfd: Add WM8350 audio register definitions
  regulator: Export regulator name via sysfs
  regulator: Add WM8400 regulator support
  mfd: Core support for the WM8400 AudioPlus HiFi CODEC and PMU
  ...

diff --combined MAINTAINERS
index 988b0a85289066bc354504df53e34b3e72c7f124,3fa9ac680f0fcfcb8d12009488e4d4e72b17b6a2..5d0b8a23d63968e8d1c57640024fb2951cb1efcc
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -72,8 -72,8 +72,8 @@@ M: Mail patches t
  L: Mailing list that is relevant to this area
  W: Web-page with status/info
  T: SCM tree type and location.  Type is one of: git, hg, quilt.
 -S: Status, one of the following:
  F: Applicable files and/or directories
 +S: Status, one of the following:
  
        Supported:      Someone is actually paid to look after this.
        Maintained:     Someone actually looks after it.
@@@ -4520,10 -4520,11 +4520,11 @@@ S:   Maintaine
  
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  P:    Liam Girdwood
- M:    l[email protected]
+ M:    l[email protected]
  P:    Mark Brown
  M:    [email protected]
  W:    http://opensource.wolfsonmicro.com/node/15
+ W:    http://www.slimlogic.co.uk/?page_id=5
  T:    git kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git
  S:    Supported