Merge remote-tracking branches 'regulator/topic/palmas', 'regulator/topic/pbias'...

author Mark Brown <broonie@linaro.org>

Wed, 28 May 2014 20:35:03 +0000 (21:35 +0100)

committer Mark Brown <broonie@linaro.org>

Wed, 28 May 2014 20:35:03 +0000 (21:35 +0100)
author Mark Brown <broonie@linaro.org>
Wed, 28 May 2014 20:35:03 +0000 (21:35 +0100)
committer Mark Brown <broonie@linaro.org>
Wed, 28 May 2014 20:35:03 +0000 (21:35 +0100)
diff --cc drivers/regulator/palmas-regulator.c
Simple merge
diff --cc drivers/regulator/s2mpa01.c
Simple merge
diff --cc include/linux/regulator/consumer.h
Simple merge
author	Mark Brown <broonie@linaro.org>
	Wed, 28 May 2014 20:35:03 +0000 (21:35 +0100)
committer	Mark Brown <broonie@linaro.org>
	Wed, 28 May 2014 20:35:03 +0000 (21:35 +0100)
		1	2	3	4	5	6	7	8	9
drivers/regulator/palmas-regulator.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
drivers/regulator/s2mpa01.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
include/linux/regulator/consumer.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history