Merge remote-tracking branch 'regulator/topic/core' into regulator-next

author Mark Brown <broonie@kernel.org>

Fri, 26 Jan 2018 17:56:59 +0000 (17:56 +0000)

committer Mark Brown <broonie@kernel.org>

Fri, 26 Jan 2018 17:56:59 +0000 (17:56 +0000)
author Mark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 17:56:59 +0000 (17:56 +0000)
committer Mark Brown <broonie@kernel.org>
Fri, 26 Jan 2018 17:56:59 +0000 (17:56 +0000)
diff --cc Documentation/devicetree/bindings/regulator/regulator.txt
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 26 Jan 2018 17:56:59 +0000 (17:56 +0000)
committer	Mark Brown <broonie@kernel.org>
	Fri, 26 Jan 2018 17:56:59 +0000 (17:56 +0000)