Merge remote-tracking branches 'regmap/topic/bulk', 'regmap/topic/i2c', 'regmap/topic...

author Mark Brown <[email protected]>

Fri, 15 Jul 2016 12:44:47 +0000 (13:44 +0100)

committer Mark Brown <[email protected]>

Fri, 15 Jul 2016 12:44:47 +0000 (13:44 +0100)
author Mark Brown <[email protected]>
Fri, 15 Jul 2016 12:44:47 +0000 (13:44 +0100)
committer Mark Brown <[email protected]>
Fri, 15 Jul 2016 12:44:47 +0000 (13:44 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc include/linux/regmap.h
Simple merge
author	Mark Brown <[email protected]>
	Fri, 15 Jul 2016 12:44:47 +0000 (13:44 +0100)
committer	Mark Brown <[email protected]>
	Fri, 15 Jul 2016 12:44:47 +0000 (13:44 +0100)
		1	2	3	4	5	6
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
include/linux/regmap.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history