diff --git a/[refs] b/[refs]
index 2933ca7ce320..c92d9e224e00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f6c797f84fd764efb5eeb7cbb6a80a7244bd13c
+refs/heads/master: 215b8b055de7dad26ab6c10f70130934309cb696
diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c
index 5f2221095a46..157def15ed78 100644
--- a/trunk/drivers/regulator/core.c
+++ b/trunk/drivers/regulator/core.c
@@ -778,6 +778,9 @@ static void print_constraints(struct regulator_dev *rdev)
 	if (constraints->valid_modes_mask & REGULATOR_MODE_STANDBY)
 		count += sprintf(buf + count, "standby");
 
+	if (!count)
+		sprintf(buf, "no parameters");
+
 	rdev_info(rdev, "%s\n", buf);
 
 	if ((constraints->min_uV != constraints->max_uV) &&
diff --git a/trunk/drivers/regulator/dummy.c b/trunk/drivers/regulator/dummy.c
index 86f655c7f7a1..03a1d7c11ef2 100644
--- a/trunk/drivers/regulator/dummy.c
+++ b/trunk/drivers/regulator/dummy.c
@@ -30,7 +30,7 @@ static struct regulator_init_data dummy_initdata;
 static struct regulator_ops dummy_ops;
 
 static struct regulator_desc dummy_desc = {
-	.name = "dummy",
+	.name = "regulator-dummy",
 	.id = -1,
 	.type = REGULATOR_VOLTAGE,
 	.owner = THIS_MODULE,