Merge remote-tracking branches 'regulator/topic/fixed', 'regulator/topic/id-const...

author Mark Brown <broonie@linaro.org>

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

committer Mark Brown <broonie@linaro.org>

Mon, 2 Jun 2014 16:08:05 +0000 (17:08 +0100)
author Mark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:05 +0000 (17:08 +0100)
committer Mark Brown <broonie@linaro.org>
Mon, 2 Jun 2014 16:08:05 +0000 (17:08 +0100)
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge
diff --cc drivers/regulator/Kconfig
Simple merge
diff --cc drivers/regulator/Makefile
Simple merge
diff --cc drivers/regulator/core.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Mon, 2 Jun 2014 16:08:05 +0000 (17:08 +0100)
committer	Mark Brown <broonie@linaro.org>
	Mon, 2 Jun 2014 16:08:05 +0000 (17:08 +0100)
		1	2	3	4	5	6
Documentation/devicetree/bindings/vendor-prefixes.txt	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/regulator/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/regulator/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/regulator/core.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history