Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/st-pwm...

diff --cc drivers/regulator/Kconfig
Simple merge

diff --cc drivers/regulator/Makefile
index c341672,979f9dd,d0c2bb8,979f9dd,979f9dd,979f9dd,979f9dd,979f9dd,979f9dd..0cfca37
--- 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
--- 8/drivers/regulator/Makefile
--- 9/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@@@@@@@@@ -58,9 -57,8 -57,9 -57,8 -57,8 -57,8 -57,8 -57,8 -57,8 +58,10 @@@@@@@@@@ obj-$(CONFIG_REGULATOR_TPS51632) += tps
         obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
         obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
         obj-$(CONFIG_REGULATOR_RC5T583)  += rc5t583-regulator.o
 ++++++++obj-$(CONFIG_REGULATOR_S2MPA01) += s2mpa01.o
         obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o
         obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
++ ++++++obj-$(CONFIG_REGULATOR_ST_PWM) += st-pwm.o
         obj-$(CONFIG_REGULATOR_STW481X_VMMC) += stw481x-vmmc.o
         obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o
         obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o

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

diff --cc include/linux/mfd/samsung/core.h
Simple merge