From: Mark Brown <broonie@linaro.org>
Date: Tue, 5 Aug 2014 17:14:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~156^2~5^4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7cad4c8f76869d2e689cb38e0181f1463e582352;p=pandora-kernel.git

Merge remote-tracking branch 'regulator/fix/act8865' into regulator-act8865

Conflicts:
	drivers/regulator/act8865-regulator.c
---

7cad4c8f76869d2e689cb38e0181f1463e582352
Reading git-diff-tree failed