summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-01-12 19:26:03 +0100
committerMark Brown <broonie@kernel.org>2016-01-12 19:26:03 +0100
commit353915f0b43fb156c3bf02d54d9f3dbdcbe66afe (patch)
treec1043c8eb9803b01105f30c2efac7beafdc75bfa /drivers/regulator
parentMerge remote-tracking branch 'regulator/fix/core' into regulator-linus (diff)
parentregulator: axp20x: Fix GPIO LDO enable value for AXP22x (diff)
parentregulator: mt6311: MT6311_REGULATOR needs to select REGMAP_I2C (diff)
downloadlinux-353915f0b43fb156c3bf02d54d9f3dbdcbe66afe.tar.xz
linux-353915f0b43fb156c3bf02d54d9f3dbdcbe66afe.zip
Merge remote-tracking branches 'regulator/fix/axp20x' and 'regulator/fix/mt6311' into regulator-linus