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

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
index f30cb0e2d6fb4f236faf1699415e8cd3f179744a,e246e148a7f9bf94f990d9f01960b2a973669a23..dc3503fb3e30c0980acc4fe850302d0e91fd20a8
--- 1/drivers/regulator/Makefile
--- 2/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@ -107,8 -104,8 +107,9 @@@ obj-$(CONFIG_REGULATOR_TPS6586X) += tps
  obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o
  obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o
  obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o
 +obj-$(CONFIG_REGULATOR_TPS65132) += tps65132-regulator.o
  obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o twl6030-regulator.o
+ obj-$(CONFIG_REGULATOR_VCTRL) += vctrl-regulator.o
  obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress-regulator.o
  obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
  obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o