diff --git a/[refs] b/[refs]
index 97b0e36f3c82..f371baf7637c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 296c656616bd567b2849f5a8a444452c4849ac01
+refs/heads/master: 380a0e6f72e8d0211f48c24f293a366a53b374d7
diff --git a/trunk/include/linux/regulator/driver.h b/trunk/include/linux/regulator/driver.h
index bac4c871f3bd..4a9ca04a13ef 100644
--- a/trunk/include/linux/regulator/driver.h
+++ b/trunk/include/linux/regulator/driver.h
@@ -221,7 +221,8 @@ struct regulator_desc {
  * @driver_data: private regulator data
  * @of_node: OpenFirmware node to parse for device tree bindings (may be
  *           NULL).
- * @regmap: regmap to use for core regmap helpers
+ * @regmap: regmap to use for core regmap helpers if dev_get_regulator() is
+ *          insufficient.
  * @ena_gpio: GPIO controlling regulator enable.
  * @ena_gpio_invert: Sense for GPIO enable control.
  * @ena_gpio_flags: Flags to use when calling gpio_request_one()