From: Mark Brown <broonie@linaro.org>
Date: Mon, 16 Sep 2013 23:34:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'regulator/topic/devm' into regulator-palmas
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~16^2~8^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0175e7e78ef6dddf13a67f968332b3e44a5995d;p=pandora-kernel.git

Merge remote-tracking branch 'regulator/topic/devm' into regulator-palmas

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

d0175e7e78ef6dddf13a67f968332b3e44a5995d
Reading git-diff-tree failed