Merge remote-tracking branches 'asoc/topic/es8328', 'asoc/topic/find-dai', 'asoc...

author Mark Brown <[email protected]>

Fri, 13 May 2016 13:27:01 +0000 (14:27 +0100)

committer Mark Brown <[email protected]>

Fri, 13 May 2016 13:27:01 +0000 (14:27 +0100)
author Mark Brown <[email protected]>
Fri, 13 May 2016 13:27:01 +0000 (14:27 +0100)
committer Mark Brown <[email protected]>
Fri, 13 May 2016 13:27:01 +0000 (14:27 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc include/sound/soc.h
Simple merge
diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge
author	Mark Brown <[email protected]>
	Fri, 13 May 2016 13:27:01 +0000 (14:27 +0100)
committer	Mark Brown <[email protected]>
	Fri, 13 May 2016 13:27:01 +0000 (14:27 +0100)
		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
sound/soc/fsl/fsl_ssi.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history