summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/palmas-regulator.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-07-03 17:52:21 +0200
committerMark Brown <broonie@kernel.org>2017-07-03 17:52:21 +0200
commit8d67f64f7739464c352d4b167ed1748f3b2c1f44 (patch)
tree5201724cb8188ba2af2193a43a73c83ab9eb0ec8 /drivers/regulator/palmas-regulator.c
parentMerge remote-tracking branches 'regulator/topic/hi6421v530', 'regulator/topic... (diff)
parentregulator: Allow for asymmetric settling times (diff)
parentregulator: tps65910: wire up sleep control configuration (diff)
parentregulator: tps65917: Add support for SMPS12 (diff)
downloadlinux-8d67f64f7739464c352d4b167ed1748f3b2c1f44.tar.xz
linux-8d67f64f7739464c352d4b167ed1748f3b2c1f44.zip
Merge remote-tracking branches 'regulator/topic/settle', 'regulator/topic/tps65910' and 'regulator/topic/tps65917' into regulator-next