]> git.baikalelectronics.ru Git - kernel.git/commit
regulator: core: Remove duplicate copy of active-discharge parsing
authorVladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Thu, 24 Mar 2016 19:52:01 +0000 (21:52 +0200)
committerMark Brown <broonie@kernel.org>
Fri, 25 Mar 2016 11:12:33 +0000 (11:12 +0000)
commit34498ca3b3ae7eb9563ac1e8d36a181f3fa81df5
tree2d8887cdfce0b9b889f7cf485d9d3af062d0a144
parente36419492e57dae6d732f072acd46e2fa99aa78f
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 6a6cbd1e5fd2
("regulator: core: Add support for active-discharge configuration").

The first applied commit 4c6dbc3da26b ("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>
drivers/regulator/core.c