summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/pfuze100-regulator.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-01-23 13:01:27 +0100
committerMark Brown <broonie@linaro.org>2014-01-23 13:01:27 +0100
commita2a2be6309285857bfbc66f83e164331828e93c2 (patch)
tree9fca0745307014247914694d1e1b62f697646b35 /drivers/regulator/pfuze100-regulator.c
parentMerge remote-tracking branches 'regulator/fix/pfuze100', 'regulator/fix/s5m87... (diff)
parentregulator: db8500-prcmu: use devm_regulator_register() (diff)
parentregulator: gpio: Warn if an invalid regulator-type is supplied (diff)
parentregulator: lp3971: Convert to devm_regulator_register (diff)
parentregulator: lp3972: Convert to devm_regulator_register (diff)
parentregulator: max14577: Add module alias to support module auto-loading (diff)
parentregulator: max77693: Add missing .owner field in regulator_desc (diff)
parentregulator: mc13892: Fix checkpatch issue (diff)
parentmfd: pcf50633: Correct device name for pcf50633 regulator (diff)
parentregulator: pfuze100-regulator: Fix some checkpatch complaints (diff)
downloadlinux-a2a2be6309285857bfbc66f83e164331828e93c2.tar.xz
linux-a2a2be6309285857bfbc66f83e164331828e93c2.zip
Merge remote-tracking branches 'regulator/topic/db8500', 'regulator/topic/gpio', 'regulator/topic/lp3971', 'regulator/topic/lp3972', 'regulator/topic/max14577', 'regulator/topic/max77693', 'regulator/topic/mc13892', 'regulator/topic/pcf50633' and 'regulator/topic/pfuze100' into regulator-linus