Merge remote-tracking branches 'asoc/topic/fsi', 'asoc/topic/fsl', 'asoc/topic/fsl...

author Mark Brown <[email protected]>

Sun, 30 Aug 2015 14:53:56 +0000 (15:53 +0100)

committer Mark Brown <[email protected]>

Sun, 30 Aug 2015 14:53:56 +0000 (15:53 +0100)
author Mark Brown <[email protected]>
Sun, 30 Aug 2015 14:53:56 +0000 (15:53 +0100)
committer Mark Brown <[email protected]>
Sun, 30 Aug 2015 14:53:56 +0000 (15:53 +0100)
diff --cc sound/soc/fsl/fsl_sai.h
Simple merge
diff --cc sound/soc/fsl/fsl_spdif.c
Simple merge
diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge
author	Mark Brown <[email protected]>
	Sun, 30 Aug 2015 14:53:56 +0000 (15:53 +0100)
committer	Mark Brown <[email protected]>
	Sun, 30 Aug 2015 14:53:56 +0000 (15:53 +0100)
		1	2	3	4	5	6
sound/soc/fsl/fsl_sai.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/fsl/fsl_spdif.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/fsl/fsl_ssi.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history