aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 14:40:11 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 14:40:11 +0100
commitaaa9b649d0868725cd7536bc9017fe3956ad5393 (patch)
tree13dacc6078ebbf50b4ffdf8a00df3145e460b29c /drivers/regulator/Makefile
parentMerge remote-tracking branches 'regulator/topic/mt6311', 'regulator/topic/ocp', 'regulator/topic/owner', 'regulator/topic/pfuze100' and 'regulator/topic/pwm' into regulator-next (diff)
parentregulator: qcom_smd: Set n_voltages for pm8941_lnldo (diff)
parentregulator: qcom-spmi: Add vendor specific configuration (diff)
parentregulator: rk808: make better use of the gpiod API (diff)
parentregulator: Add missing dummy definition for regulator_list_voltage (diff)
parentregulator: core: Define regulator_set_voltage_triplet() (diff)
downloadlinux-dev-aaa9b649d0868725cd7536bc9017fe3956ad5393.tar.xz
linux-dev-aaa9b649d0868725cd7536bc9017fe3956ad5393.zip
Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/qcom-spmi', 'regulator/topic/rk808', 'regulator/topic/stub' and 'regulator/topic/tol' into regulator-next