summaryrefslogtreecommitdiff
path: root/include/linux/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-05 21:14:31 +0400
committerMark Brown <broonie@linaro.org>2014-08-05 21:14:31 +0400
commit7cad4c8f76869d2e689cb38e0181f1463e582352 (patch)
tree6fba4deafcd1be4605870531068a6fedbf3cd176 /include/linux/regulator
parent34e0247ffcae3228684668a6244a7308b78571c7 (diff)
parent732714d0da4f3273e4b9a9dbe3e7556ea1188e36 (diff)
downloadlinux-7cad4c8f76869d2e689cb38e0181f1463e582352.tar.xz
Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865
Conflicts: drivers/regulator/act8865-regulator.c
Diffstat (limited to 'include/linux/regulator')
0 files changed, 0 insertions, 0 deletions