diff --git a/[refs] b/[refs]
index 141b2ccb3a1f..538654cd14bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 006694d099e86e5a928fb39bdea280ab42c9d59c
+refs/heads/master: dea05fe66edb4540a53ed6623794c4978315256a
diff --git a/trunk/Documentation/devicetree/bindings/regulator/gpio-regulator.txt b/trunk/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
index 3703be2ab821..f71f8083c2ae 100644
--- a/trunk/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
+++ b/trunk/Documentation/devicetree/bindings/regulator/gpio-regulator.txt
@@ -4,7 +4,7 @@ Required properties:
 - compatible		: Must be "regulator-gpio".
 
 Optional properties:
-- gpio-enable		: GPIO to use to enable/disable the regulator.
+- enable-gpio		: GPIO to use to enable/disable the regulator.
 - gpios			: GPIO group used to control voltage.
 - states		: Selection of available voltages and GPIO configs.
 - startup-delay-us	: Startup time in microseconds.
@@ -23,7 +23,7 @@ Example:
 		regulator-max-microvolt = <2600000>;
 		regulator-boot-on;
 
-		gpio-enable = <&gpio0 23 0x4>;
+		enable-gpio = <&gpio0 23 0x4>;
 		gpios = <&gpio0 24 0x4
 			 &gpio0 25 0x4>;
 		states = <1800000 0x3