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

* 'reg-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  regulator: TI bq24022 Li-Ion Charger driver
  regulator: maintainers - add maintainers for regulator framework.
  regulator: documentation - ABI
  regulator: documentation - machine
  regulator: documentation - regulator driver
  regulator: documentation - consumer interface
  regulator: documentation - overview
  regulator: core kbuild files
  regulator: regulator test harness
  regulator: add support for fixed regulators.
  regulator: regulator framework core
  regulator: fixed regulator interface
  regulator: machine driver interface
  regulator: regulator driver interface
  regulator: consumer device interface

diff --combined MAINTAINERS
index 5f043d1,42e7ed9..c65a5b9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -3968,7 -3968,7 +3968,7 @@@ M:      lethal@linux-sh.or
  L:    linux-sh@vger.kernel.org
  W:    http://www.linux-sh.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git
 -S:    Maintained
 +S:    Supported
  
  SUN3/3X
  P:    Sam Creasey
@@@ -4504,6 -4504,15 +4504,15 @@@ M:    kaber@trash.ne
  L:    netdev@vger.kernel.org
  S:    Maintained
  
+ VOLTAGE AND CURRENT REGULATOR FRAMEWORK
+ P:    Liam Girdwood
+ M:    lg@opensource.wolfsonmicro.com
+ P:    Mark Brown
+ M:    broonie@opensource.wolfsonmicro.com
+ W:    http://opensource.wolfsonmicro.com/node/15
+ T:    git kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git
+ S:    Supported
+ 
  VT1211 HARDWARE MONITOR DRIVER
  P:    Juerg Haefliger
  M:    juergh@gmail.com