Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865
authorMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 17:14:31 +0000 (18:14 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 5 Aug 2014 17:14:31 +0000 (18:14 +0100)
commit7cad4c8f76869d2e689cb38e0181f1463e582352
tree6fba4deafcd1be4605870531068a6fedbf3cd176
parent34e0247ffcae3228684668a6244a7308b78571c7
parent732714d0da4f3273e4b9a9dbe3e7556ea1188e36
Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865

Conflicts:
drivers/regulator/act8865-regulator.c