From: Mark Brown <broonie@kernel.org>
Date: Fri, 9 Jan 2015 18:03:55 +0000 (+0000)
Subject: Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v4.0-rc1~166^2~4^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09d3f6f1613f287b1d3ea7d2c9caf5b7aff70c99;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-dt-cb

Conflicts:
	drivers/regulator/core.c
---

09d3f6f1613f287b1d3ea7d2c9caf5b7aff70c99
diff --cc drivers/regulator/core.c
index 5fae8cabd254e,c2554d89d472f..685cc1500e381
--- a/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;
 +	struct regulator_config *config = NULL;
- 	static atomic_t regulator_no = ATOMIC_INIT(0);
+ 	static atomic_t regulator_no = ATOMIC_INIT(-1);
  	struct regulator_dev *rdev;
  	struct device *dev;
  	int ret, i;