Merge remote-tracking branch 'regulator/topic/pwm' into regulator-drivers
authorMark Brown <broonie@kernel.org>
Sun, 28 Sep 2014 11:14:26 +0000 (12:14 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 28 Sep 2014 11:14:26 +0000 (12:14 +0100)
Conflicts:
drivers/regulator/Kconfig


Trivial merge