Merge remote-tracking branches 'asoc/topic/ab8500', 'asoc/topic/arizona', 'asoc/topic...

author Mark Brown <[email protected]>

Mon, 12 Dec 2016 15:52:48 +0000 (15:52 +0000)

committer Mark Brown <[email protected]>

Mon, 12 Dec 2016 15:52:48 +0000 (15:52 +0000)
author Mark Brown <[email protected]>
Mon, 12 Dec 2016 15:52:48 +0000 (15:52 +0000)
committer Mark Brown <[email protected]>
Mon, 12 Dec 2016 15:52:48 +0000 (15:52 +0000)
diff --cc MAINTAINERS
Simple merge
diff --cc include/sound/soc.h
Simple merge
author	Mark Brown <[email protected]>
	Mon, 12 Dec 2016 15:52:48 +0000 (15:52 +0000)
committer	Mark Brown <[email protected]>
	Mon, 12 Dec 2016 15:52:48 +0000 (15:52 +0000)
		1	2	3	4	5	6
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
include/sound/soc.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history