Merge remote-tracking branches 'regulator/topic/max77686', 'regulator/topic/max8973...

author Mark Brown <[email protected]>

Fri, 13 May 2016 13:23:38 +0000 (14:23 +0100)

committer Mark Brown <[email protected]>

Fri, 13 May 2016 13:23:38 +0000 (14:23 +0100)
author Mark Brown <[email protected]>
Fri, 13 May 2016 13:23:38 +0000 (14:23 +0100)
committer Mark Brown <[email protected]>
Fri, 13 May 2016 13:23:38 +0000 (14:23 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/regulator/Kconfig
Simple merge
diff --cc drivers/regulator/Makefile
Simple merge
author	Mark Brown <[email protected]>
	Fri, 13 May 2016 13:23:38 +0000 (14:23 +0100)
committer	Mark Brown <[email protected]>
	Fri, 13 May 2016 13:23:38 +0000 (14:23 +0100)
		1	2	3	4	5	6
MAINTAINERS	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