summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/palmas-regulator.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-02 18:08:12 +0200
committerMark Brown <broonie@linaro.org>2014-06-02 18:08:12 +0200
commitb58e917bf9eadf1efbbebe49f13235c56f0c2c4f (patch)
treeff92093df139ce4296d1784a7c21e7c0a0391d3a /drivers/regulator/palmas-regulator.c
parentMerge remote-tracking branches 'regulator/topic/palmas', 'regulator/topic/pbi... (diff)
parentregulator: s5m8767: Allow GPIO 0 to be used as external control (diff)
parentregulators: Add definition of regulator_set_voltage_time() for !CONFIG_REGULATOR (diff)
parentregulator: tps65090: Fix tps65090 crash on Tegra Dalmore (diff)
parentregulator: tps65217: Use regulator_map_voltage_ascend for LDO1 (diff)
parentregulator: tps65218: Convert to use regulator_set_voltage_time_sel (diff)
downloadlinux-b58e917bf9eadf1efbbebe49f13235c56f0c2c4f.tar.xz
linux-b58e917bf9eadf1efbbebe49f13235c56f0c2c4f.zip
Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/stub', 'regulator/topic/tps65090', 'regulator/topic/tps65217' and 'regulator/topic/tps65218' into regulator-next