Merge tag 'v4.11-rc1' into regulator-arizona

author Mark Brown <[email protected]>

Tue, 25 Apr 2017 15:35:35 +0000 (16:35 +0100)

committer Mark Brown <[email protected]>

Tue, 25 Apr 2017 15:35:35 +0000 (16:35 +0100)
author Mark Brown <[email protected]>
Tue, 25 Apr 2017 15:35:35 +0000 (16:35 +0100)
committer Mark Brown <[email protected]>
Tue, 25 Apr 2017 15:35:35 +0000 (16:35 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/regulator/arizona-ldo1.c
Simple merge
diff --cc drivers/regulator/arizona-micsupp.c
Simple merge
author	Mark Brown <[email protected]>
	Tue, 25 Apr 2017 15:35:35 +0000 (16:35 +0100)
committer	Mark Brown <[email protected]>
	Tue, 25 Apr 2017 15:35:35 +0000 (16:35 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/regulator/arizona-ldo1.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/regulator/arizona-micsupp.c	patch \|	diff1 \|	diff2 \|	blob \| history