Hi Samuel,

Today's linux-next merge of the mfd tree got a conflict in
Documentation/devicetree/bindings/regulator/tps6586x.txt between commit
7f852e0584f6 ("regulator: tps6586x: correct vin pin for sm0/sm1/sm2")
from Linus' tree and commit 566a725dff0d ("mfd: dt: tps6586x: Add power
off control") from the mfd tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc Documentation/devicetree/bindings/regulator/tps6586x.txt
index da80c2a,03dfa4e..0000000
--- a/Documentation/devicetree/bindings/regulator/tps6586x.txt
+++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt
@@@ -30,9 -34,11 +34,11 @@@ Example
  		#gpio-cells = <2>;
  		gpio-controller;
  
+ 		ti,system-power-controller;
+ 
 -		sm0-supply = <&some_reg>;
 -		sm1-supply = <&some_reg>;
 -		sm2-supply = <&some_reg>;
 +		vin-sm0-supply = <&some_reg>;
 +		vin-sm1-supply = <&some_reg>;
 +		vin-sm2-supply = <&some_reg>;
  		vinldo01-supply = <...>;
  		vinldo23-supply = <...>;
  		vinldo4-supply = <...>;