Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pwm', 'regulato...

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
Simple merge

diff --cc drivers/regulator/of_regulator.c
Simple merge

diff --cc include/linux/regulator/driver.h
Simple merge

diff --cc include/linux/regulator/machine.h
index 85a3b457de518f937a2f1b0ba9c7120d090c6369,b07562e082c416a2b98fc08818f35111c8237288,b07562e082c416a2b98fc08818f35111c8237288,b07562e082c416a2b98fc08818f35111c8237288,1258275d3751c5c7c9085bcc6b0e729941632f7c..b11be126012974ebf4877220c8949310d649ddea
--- 1/include/linux/regulator/machine.h
--- 2/include/linux/regulator/machine.h
--- 3/include/linux/regulator/machine.h
--- 4/include/linux/regulator/machine.h
--- 5/include/linux/regulator/machine.h
+++ b/include/linux/regulator/machine.h
@@@@@@ -75,8 -75,6 -75,6 -75,6 -75,7 +75,8 @@@@@@ struct regulator_state 
      *
      * @min_uA: Smallest current consumers may set.
      * @max_uA: Largest current consumers may set.
 ++++ * @ilim_uA: Maximum input current.
 +++  * @system_load: Load that isn't captured by any consumer requests.
      *
      * @valid_modes_mask: Mask of modes which may be configured by consumers.
      * @valid_ops_mask: Operations which may be performed by consumers.
@@@@@@ -88,7 -86,6 -86,6 -86,6 -87,8 +88,8 @@@@@@
      *           applied.
      * @apply_uV: Apply the voltage constraint when initialising.
      * @ramp_disable: Disable ramp delay when initialising or when setting voltage.
++++  * @soft_start: Enable soft start so that voltage ramps slowly.
 +++  * @pull_down: Enable pull down when regulator is disabled.
      *
      * @input_uV: Input voltage for regulator when supplied by another regulator.
      *
@@@@@@ -114,9 -111,6 -111,6 -111,6 -114,8 +115,9 @@@@@@ struct regulation_constraints 
        /* current output range (inclusive) - for current control */
        int min_uA;
        int max_uA;
 ++++   int ilim_uA;
 +++ 
 +++    int system_load;
     
        /* valid regulator operating modes for this machine */
        unsigned int valid_modes_mask;