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

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

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

4c0c9cabcb30d9d3104d2482536a0f60376085f6
Reading git-diff-tree failed