diff --git a/[refs] b/[refs]
index 08842427db8c..567648614857 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32c8fad438200b523ec44a49b40cb8ffdf715f7c
+refs/heads/master: 127ef6274a682d8ce88fd9e6614c0b30c7f8ef34
diff --git a/trunk/Documentation/power/regulator/regulator.txt b/trunk/Documentation/power/regulator/regulator.txt
index e272d9909e39..13902778ae44 100644
--- a/trunk/Documentation/power/regulator/regulator.txt
+++ b/trunk/Documentation/power/regulator/regulator.txt
@@ -11,8 +11,7 @@ Registration
 Drivers can register a regulator by calling :-
 
 struct regulator_dev *regulator_register(struct regulator_desc *regulator_desc,
-	struct device *dev, struct regulator_init_data *init_data,
-	void *driver_data, struct device_node *of_node);
+					 const struct regulator_config *config);
 
 This will register the regulators capabilities and operations to the regulator
 core.