From: Mark Brown <broonie@kernel.org>
Date: Sun, 28 Sep 2014 11:14:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers
X-Git-Tag: fixes-for-v3.18-merge-window~31^2~3^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3;p=pandora-kernel.git

Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers

Conflicts:
	drivers/regulator/Kconfig
---

d1c3f7ca158e78fa78c9789d836d2a98d5fd25f3
Reading git-diff-tree failed