summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-22 12:19:56 +0200
committerMark Brown <broonie@kernel.org>2015-06-22 12:19:56 +0200
commit733ada000f2c9618ccbac7b9ba146113f0a6675b (patch)
tree1253fa0449fcc9027f195c76689ad77a70b755f0 /drivers/regulator/Makefile
parentMerge remote-tracking branches 'regulator/topic/lp8755', 'regulator/topic/max... (diff)
parentregulator: of: Skip disabled regulator nodes (diff)
parentregulator: pwm-regulator: Diffientiate between dev (device) and rdev (regulat... (diff)
parentregulator: qcom_spmi: Fix calculating number of voltages (diff)
parentregulator: Add docbook for soft start (diff)
downloadlinux-733ada000f2c9618ccbac7b9ba146113f0a6675b.tar.xz
linux-733ada000f2c9618ccbac7b9ba146113f0a6675b.zip
Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pwm', 'regulator/topic/qcom' and 'regulator/topic/soft-start' into regulator-next