diff options
| author | Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com> | 2016-03-24 21:52:01 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-03-25 11:12:33 +0000 |
| commit | e437b90026ac754a0f8b4fe44b844d12ce6162d1 (patch) | |
| tree | 2d8887cdfce0b9b889f7cf485d9d3af062d0a144 /Documentation/.gitignore | |
| parent | 768e66686cfe83f786f6ae26f1799cca69e80523 (diff) | |
regulator: core: Remove duplicate copy of active-discharge parsing
Apparently due to a wrongly resolved merge conflict between two
branches, which contained the same commit, the commit contents
partially was added two times in a row.
This change reverts the latter wrong inclusion of commit 909f7ee0b5f3
("regulator: core: Add support for active-discharge configuration").
The first applied commit 670666b9e0af ("regulator: core: Add support
for active-discharge configuration") is not touched.
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Cc: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'Documentation/.gitignore')