Merge branch 'devel-dt-regulator' into devel-dt

diff --cc arch/arm/boot/dts/am33xx.dtsi
index 5f6c8e33060f77b56cd9dd38461b8f80e15e6958,bd0cff3f808c7c5be55ce79dd31b343d37e6297a..dde76f7e81a87edaa50bcb3cc2435db510cbf72f
--- 1/arch/arm/boot/dts/am33xx.dtsi
--- 2/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@@ -161,7 -153,11 +161,12 @@@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        ti,hwmods = "i2c3";
 +                      status = "disabled";
                };
+ 
+               wdt2: wdt@44e35000 {
+                       compatible = "ti,omap3-wdt";
+                       ti,hwmods = "wd_timer2";
+               };
        };
  };