Merge branches 'topic/tps51632', 'topic/tps80031', 'topic/vexpress', 'topic/max8925...

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
index e431eed8a8782f2f49fc1869365b76929dc52001,ec1aec460bf6f99aacb893f5a228e0809fa9da82,e5882668618f1188dd1c8c9fabbf661d3e08fda2,9fa7a7bc42d88423d7cf60466b7ca8bd0d228136,e431eed8a8782f2f49fc1869365b76929dc52001,e431eed8a8782f2f49fc1869365b76929dc52001,e431eed8a8782f2f49fc1869365b76929dc52001..6166d122d12520b9dbf96811dee1d58fffc47de9
--- 1/drivers/regulator/Makefile
--- 2/drivers/regulator/Makefile
--- 3/drivers/regulator/Makefile
--- 4/drivers/regulator/Makefile
--- 5/drivers/regulator/Makefile
--- 6/drivers/regulator/Makefile
--- 7/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@@@@@@ -56,7 -57,7 -56,8 -56,8 -56,7 -56,7 -56,7 +57,9 @@@@@@@@ obj-$(CONFIG_REGULATOR_TPS6524X) += tps
       obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o
       obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o
       obj-$(CONFIG_REGULATOR_TPS65912) += tps65912-regulator.o
++ ++++obj-$(CONFIG_REGULATOR_TPS80031) += tps80031-regulator.o
       obj-$(CONFIG_REGULATOR_TWL4030) += twl-regulator.o
+++ +++obj-$(CONFIG_REGULATOR_VEXPRESS) += vexpress.o
       obj-$(CONFIG_REGULATOR_WM831X) += wm831x-dcdc.o
       obj-$(CONFIG_REGULATOR_WM831X) += wm831x-isink.o
       obj-$(CONFIG_REGULATOR_WM831X) += wm831x-ldo.o

diff --cc drivers/regulator/core.c
Simple merge