Merge remote-tracking branches 'regulator/topic/settle', 'regulator/topic/tps65910...

author Mark Brown <broonie@kernel.org>

Mon, 3 Jul 2017 15:52:21 +0000 (16:52 +0100)

committer Mark Brown <broonie@kernel.org>

Mon, 3 Jul 2017 15:52:21 +0000 (16:52 +0100)
author Mark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:52:21 +0000 (16:52 +0100)
committer Mark Brown <broonie@kernel.org>
Mon, 3 Jul 2017 15:52:21 +0000 (16:52 +0100)
diff --cc drivers/regulator/core.c
Simple merge
diff --cc drivers/regulator/palmas-regulator.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 3 Jul 2017 15:52:21 +0000 (16:52 +0100)
committer	Mark Brown <broonie@kernel.org>
	Mon, 3 Jul 2017 15:52:21 +0000 (16:52 +0100)
		1	2	3	4
drivers/regulator/core.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/regulator/palmas-regulator.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history