From: Mark Brown <broonie@linaro.org>
Date: Thu, 24 Oct 2013 10:11:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
X-Git-Tag: v3.13-rc1~124^2~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aef393da7501693a1b91a1cfed1a9ea408ceabe6;p=karo-tx-linux.git

Merge remote-tracking branch 'regulator/topic/optional' into regulator-next
---

aef393da7501693a1b91a1cfed1a9ea408ceabe6
diff --cc drivers/regulator/core.c
index 960103a61000,82805e2d8a64..6382f0af353b
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@ -53,9 -52,7 +53,8 @@@ static DEFINE_MUTEX(regulator_list_mute
  static LIST_HEAD(regulator_list);
  static LIST_HEAD(regulator_map_list);
  static LIST_HEAD(regulator_ena_gpio_list);
 +static LIST_HEAD(regulator_supply_alias_list);
  static bool has_full_constraints;
- static bool board_wants_dummy_regulator;
  
  static struct dentry *debugfs_root;