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


Trivial merge