diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-05 18:14:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-05 18:14:31 +0100 |
| commit | 7cad4c8f76869d2e689cb38e0181f1463e582352 (patch) | |
| tree | 6fba4deafcd1be4605870531068a6fedbf3cd176 /tools/perf/scripts/python | |
| parent | regulator: act8865: fix build when OF is not enabled (diff) | |
| parent | regulator: act8865: set correct number of regulators in pdata (diff) | |
| download | linux-7cad4c8f76869d2e689cb38e0181f1463e582352.tar.gz linux-7cad4c8f76869d2e689cb38e0181f1463e582352.zip | |
Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865
Conflicts:
drivers/regulator/act8865-regulator.c
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions