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

diff --combined drivers/regulator/Makefile
index a4094cd274be56e54e36a3ca82b00f13904e2870,0f4964ee5d303869e00435c467985f64c9093329..c4b50fc7f44fd9e04290e62676e0a1aa24c09a0f
--- 1/drivers/regulator/Makefile
--- 2/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@ -12,7 -12,7 +12,7 @@@ obj-$(CONFIG_REGULATOR_USERSPACE_CONSUM
  obj-$(CONFIG_REGULATOR_88PM8607) += 88pm8607.o
  obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o
  obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o
- obj-$(CONFIG_REGULATOR_AB8500)        += ab8500.o ab8500-ext.o
+ obj-$(CONFIG_REGULATOR_AB8500)        += ab8500-ext.o ab8500.o
  obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o
  obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o
  obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o
@@@ -41,7 -41,6 +41,7 @@@ obj-$(CONFIG_REGULATOR_MAX8973) += max8
  obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o
  obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o
  obj-$(CONFIG_REGULATOR_MAX77686) += max77686.o
 +obj-$(CONFIG_REGULATOR_MAX77693) += max77693.o
  obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
  obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
  obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +=  mc13xxx-regulator-core.o