projects / linux-drm-fsl-dcu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7b83648 9c4c605 d8eb6fa 8bad62c ef4bcf8 33e63ba fe23ce0 0ad91c6 94ee607)
Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/st-pwm...
authorMark Brown <broonie@linaro.org>
Wed, 26 Mar 2014 16:58:18 +0000 (16:58 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 26 Mar 2014 16:58:18 +0000 (16:58 +0000)
1  2  3  4  5  6  7  8  9 
drivers/regulator/Kconfig patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | blob | history
drivers/regulator/Makefile patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | blob | history
drivers/regulator/s5m8767.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | blob | history
include/linux/mfd/samsung/core.h patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | diff7 | diff8 | diff9 | blob | history

diff --cc drivers/regulator/Kconfig
Simple merge
diff --cc drivers/regulator/Makefile
index c3416728c14d505685a6daeae905741bdb31b95e,979f9ddcf259bd5a82b6b5d91f81981902e6185c,d0c2bb85b8cbfa68a8c9a819753f21a4f0cb6ed8,979f9ddcf259bd5a82b6b5d91f81981902e6185c,979f9ddcf259bd5a82b6b5d91f81981902e6185c,979f9ddcf259bd5a82b6b5d91f81981902e6185c,979f9ddcf259bd5a82b6b5d91f81981902e6185c,979f9ddcf259bd5a82b6b5d91f81981902e6185c,979f9ddcf259bd5a82b6b5d91f81981902e6185c..0cfca37941ec4aa6d97ff77a531ac202550893e3
--- 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
Freescale DCU DRM driver