Merge remote-tracking branch 'regulator/for-next'

Conflicts:
	Documentation/devicetree/bindings/regulator/tps6586x.txt

diff --cc Documentation/devicetree/bindings/regulator/tps6586x.txt
index ead89260d957e6cd601b404899f86c23922b627e,a2436e1edfc1ea39a76e87becbc65644f106f004..9b05e24b63d0ed724ce2ecc42963f10f754e9bd0
--- 1/Documentation/devicetree/bindings/regulator/tps6586x.txt
--- 2/Documentation/devicetree/bindings/regulator/tps6586x.txt
+++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt
@@@ -18,12 -19,11 +19,15 @@@ Required properties
  - vinldo678-supply: The input supply for the LDO6, LDO7 and LDO8
  - vinldo9-supply: The input supply for the LDO9
  
 +Optional properties:
 +- ti,system-power-controller: Telling whether or not this pmic is controlling
 +  the system power.
 +
  Each regulator is defined using the standard binding for regulators.
  
+ Note: LDO5 and LDO_RTC is supplied by SYS regulator internally and driver
+       take care of making proper parent child relationship.
+ 
  Example:
  
        pmu: tps6586x@34 {
@@@ -34,8 -34,7 +38,9 @@@
                #gpio-cells = <2>;
                gpio-controller;
  
 +              ti,system-power-controller;
 +
+               sys-supply = <&some_reg>;
                vin-sm0-supply = <&some_reg>;
                vin-sm1-supply = <&some_reg>;
                vin-sm2-supply = <&some_reg>;

diff --cc drivers/mfd/tps6586x.c
Simple merge

diff --cc drivers/regulator/wm831x-dcdc.c
Simple merge

diff --cc drivers/regulator/wm831x-ldo.c
Simple merge

diff --cc include/linux/mfd/tps6586x.h
Simple merge