summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/s2mps11.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-05 12:14:40 +0100
committerMark Brown <broonie@kernel.org>2014-12-05 12:14:40 +0100
commit1b56ffda75ba1400134d9250e8aa0de53ede3629 (patch)
tree794fc4defdb2fed8d4fb84363fd42df5a06e1b49 /drivers/regulator/s2mps11.c
parentMerge remote-tracking branches 'regulator/topic/max77686', 'regulator/topic/m... (diff)
parentregulator: rn5t618: Convert to new style DT parsing (diff)
parentregulator: rpm: add support for RPM-controller SMB208 (diff)
parentregulator: rt5033: Add RT5033 Regulator device driver (diff)
parentregulator: s2mpa01: Make regulator_desc array const (diff)
parentregulator: s2mps11: Don't zero allocated memory for external control (diff)
downloadlinux-1b56ffda75ba1400134d9250e8aa0de53ede3629.tar.xz
linux-1b56ffda75ba1400134d9250e8aa0de53ede3629.zip
Merge remote-tracking branches 'regulator/topic/rn5t618', 'regulator/topic/rpm', 'regulator/topic/rt5033', 'regulator/topic/s2mpa01' and 'regulator/topic/s2mps11' into regulator-next