Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/stub'...

author Mark Brown <broonie@linaro.org>

Mon, 2 Jun 2014 16:08:12 +0000 (17:08 +0100)

committer Mark Brown <broonie@linaro.org>

Mon, 2 Jun 2014 16:08:12 +0000 (17:08 +0100)
author Mark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:12 +0000 (17:08 +0100)
committer Mark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:12 +0000 (17:08 +0100)
diff --cc include/linux/regulator/consumer.h
Simple merge
author	Mark Brown <broonie@linaro.org>
	Mon, 2 Jun 2014 16:08:12 +0000 (17:08 +0100)
committer	Mark Brown <broonie@linaro.org>
	Mon, 2 Jun 2014 16:08:12 +0000 (17:08 +0100)