Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

Conflicts:
	drivers/regulator/core.c

diff --cc drivers/regulator/core.c
index 5fae8cabd254eab4b02a907b8c2deb7680fba444,c2554d89d472f2d7ac470bfd5aacbdd7c55a3c57..685cc1500e381ed35e677d11c97436f1d5eb6228
--- 1/drivers/regulator/core.c
--- 2/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@ -3585,8 -3585,7 +3585,8 @@@ regulator_register(const struct regulat
  {
        const struct regulation_constraints *constraints = NULL;
        const struct regulator_init_data *init_data;
-       static atomic_t regulator_no = ATOMIC_INIT(0);
 +      struct regulator_config *config = NULL;
+       static atomic_t regulator_no = ATOMIC_INIT(-1);
        struct regulator_dev *rdev;
        struct device *dev;
        int ret, i;