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

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
index c1557ace90954d66f3421e2444bf7ecbfe18b68d,4b754e958aed79dd3dbc697d34c5735855e7b50f..993151d6fdf9e8d7e167a9a4222da3d7227f0a98
--- 1/drivers/regulator/Makefile
--- 2/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@ -16,9 -16,9 +16,10 @@@ obj-$(CONFIG_REGULATOR_AB8500)       += ab850
  obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o
  obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o
  obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o
 +obj-$(CONFIG_REGULATOR_AS3711) += as3711-regulator.o
  obj-$(CONFIG_REGULATOR_DA903X)        += da903x.o
  obj-$(CONFIG_REGULATOR_DA9052)        += da9052-regulator.o
+ obj-$(CONFIG_REGULATOR_DA9055)        += da9055-regulator.o
  obj-$(CONFIG_REGULATOR_DBX500_PRCMU) += dbx500-prcmu.o
  obj-$(CONFIG_REGULATOR_DB8500_PRCMU) += db8500-prcmu.o
  obj-$(CONFIG_REGULATOR_FAN53555) += fan53555.o