Merge remote-tracking branches 'regulator/topic/max1586', 'regulator/topic/max77802...

author Mark Brown <broonie@kernel.org>

Tue, 30 Sep 2014 12:50:29 +0000 (13:50 +0100)

committer Mark Brown <broonie@kernel.org>

Tue, 30 Sep 2014 12:50:29 +0000 (13:50 +0100)
author Mark Brown <broonie@kernel.org>
Tue, 30 Sep 2014 12:50:29 +0000 (13:50 +0100)
committer Mark Brown <broonie@kernel.org>
Tue, 30 Sep 2014 12:50:29 +0000 (13:50 +0100)
diff --cc drivers/regulator/Kconfig
Simple merge
diff --cc drivers/regulator/Makefile
Simple merge
author	Mark Brown <broonie@kernel.org>
	Tue, 30 Sep 2014 12:50:29 +0000 (13:50 +0100)
committer	Mark Brown <broonie@kernel.org>
	Tue, 30 Sep 2014 12:50:29 +0000 (13:50 +0100)
		1	2	3	4
drivers/regulator/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/regulator/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history