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

author Mark Brown <broonie@kernel.org>

Fri, 5 Jun 2015 17:54:53 +0000 (18:54 +0100)

committer Mark Brown <broonie@kernel.org>

Fri, 5 Jun 2015 17:54:53 +0000 (18:54 +0100)
author Mark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:53 +0000 (18:54 +0100)
committer Mark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:54:53 +0000 (18:54 +0100)
diff --cc sound/soc/fsl/fsl_sai.c
Simple merge
diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 5 Jun 2015 17:54:53 +0000 (18:54 +0100)
committer	Mark Brown <broonie@kernel.org>
	Fri, 5 Jun 2015 17:54:53 +0000 (18:54 +0100)
		1	2	3	4	5	6
sound/soc/fsl/fsl_sai.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