Merge remote-tracking branches 'regulator/topic/sky81452' and 'regulator/topic/stub...

author Mark Brown <broonie@kernel.org>

Fri, 5 Dec 2014 11:14:43 +0000 (11:14 +0000)

committer Mark Brown <broonie@kernel.org>

Fri, 5 Dec 2014 11:14:43 +0000 (11:14 +0000)
author Mark Brown <broonie@kernel.org>
Fri, 5 Dec 2014 11:14:43 +0000 (11:14 +0000)
committer Mark Brown <broonie@kernel.org>
Fri, 5 Dec 2014 11:14:43 +0000 (11:14 +0000)
diff --cc drivers/regulator/Kconfig
Simple merge
diff --cc include/linux/regulator/consumer.h
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 5 Dec 2014 11:14:43 +0000 (11:14 +0000)
committer	Mark Brown <broonie@kernel.org>
	Fri, 5 Dec 2014 11:14:43 +0000 (11:14 +0000)
		1	2	3
drivers/regulator/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
include/linux/regulator/consumer.h	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history