| commit | 7cad4c8f76869d2e689cb38e0181f1463e582352 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Tue Aug 05 18:14:31 2014 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Tue Aug 05 18:14:31 2014 +0100 |
| tree | 6fba4deafcd1be4605870531068a6fedbf3cd176 | |
| parent | 34e0247ffcae3228684668a6244a7308b78571c7 [diff] | |
| parent | 732714d0da4f3273e4b9a9dbe3e7556ea1188e36 [diff] |
Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865 Conflicts: drivers/regulator/act8865-regulator.c