diff --git a/[refs] b/[refs]
index 53a38cb1af6b..6f9f5ec1a76d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4b4148379ef1ad460fc1aa6bcf2cde99cd91166
+refs/heads/master: 4aa922c024b2a194d7b68b22a66dfcf86e7838b3
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 7287000595e5..9493f6111a38 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -158,6 +158,13 @@ static int regulator_check_consumers(struct regulator_dev *rdev,
 	struct regulator *regulator;
 
 	list_for_each_entry(regulator, &rdev->consumer_list, list) {
+		/*
+		 * Assume consumers that didn't say anything are OK
+		 * with anything in the constraint range.
+		 */
+		if (!regulator->min_uV && !regulator->max_uV)
+			continue;
+
 		if (*max_uV > regulator->max_uV)
 			*max_uV = regulator->max_uV;
 		if (*min_uV < regulator->min_uV)