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

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/core.c
index 960103a6100041e008ce6793304c82299ca59b16,82805e2d8a647729bbab697b9edc20976e10e0b9..6382f0af353bc257e3ee6c3b545f75c0c1f2904e
--- 1/drivers/regulator/core.c
--- 2/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;
  

diff --cc include/linux/regulator/machine.h
Simple merge