summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/s2mps11.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-13 15:23:46 +0200
committerMark Brown <broonie@kernel.org>2016-05-13 15:23:46 +0200
commit39d652e0660bbad6a90a21042dc9f22584dfaabd (patch)
tree19267e578a84c46aa34ff09fffd32763e6497fd3 /drivers/regulator/s2mps11.c
parentMerge remote-tracking branches 'regulator/topic/max77686', 'regulator/topic/m... (diff)
parentMerge branch 'for-4.7/pwm-regulator' of git://git.kernel.org/pub/scm/linux/ke... (diff)
parentregulator: qcom_spmi: Always return a selector when asked (diff)
parentregulator: rk808: Migrate to regulator core's simplified DT parsing code (diff)
parentregulator: s2mps11: Set default ramp delay for S2MPS11 LDOs (diff)
downloadlinux-39d652e0660bbad6a90a21042dc9f22584dfaabd.tar.xz
linux-39d652e0660bbad6a90a21042dc9f22584dfaabd.zip
Merge remote-tracking branches 'regulator/topic/pwm', 'regulator/topic/qcom-spmi', 'regulator/topic/rk808' and 'regulator/topic/s2mps11' into regulator-next