summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-11 22:54:38 +0000
committerMark Brown <broonie@linaro.org>2013-12-11 22:54:38 +0000
commit67cc6885548427a4f7980b57e6ef32945f6d22b1 (patch)
tree106a25e19dac241730b0e348c015a10b3849e6bf /drivers/regulator
parent374b105797c3d4f29c685f3be535c35f5689b30e (diff)
parent6389075eff7dc1e6db39203c968394486c13b3e2 (diff)
parent236c427cbc990e03ec8b39ce8ee9220705daeff9 (diff)
downloadlinux-67cc6885548427a4f7980b57e6ef32945f6d22b1.tar.bz2
Merge remote-tracking branches 'regulator/fix/as3722' and 'regulator/fix/pfuze100' into regulator-linus