]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit61e07899043b1a4516deb6f5c9e4793f337512c6
tree6fba4deafcd1be4605870531068a6fedbf3cd176
parentdd288f923459e111b2928a2d9fb9e56d8038181c
parent60e74fd97806a62fc4de933f0ddbcb77365c196e
Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865

Conflicts:
drivers/regulator/act8865-regulator.c