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

author Mark Brown <[email protected]>

Mon, 6 Oct 2014 11:48:59 +0000 (12:48 +0100)

committer Mark Brown <[email protected]>

Mon, 6 Oct 2014 11:48:59 +0000 (12:48 +0100)
author Mark Brown <[email protected]>
Mon, 6 Oct 2014 11:48:59 +0000 (12:48 +0100)
committer Mark Brown <[email protected]>
Mon, 6 Oct 2014 11:48:59 +0000 (12:48 +0100)
diff --cc sound/soc/codecs/rt5640.c
Simple merge
diff --cc sound/soc/fsl/fsl_ssi.c
Simple merge
author	Mark Brown <[email protected]>
	Mon, 6 Oct 2014 11:48:59 +0000 (12:48 +0100)
committer	Mark Brown <[email protected]>
	Mon, 6 Oct 2014 11:48:59 +0000 (12:48 +0100)
		1	2	3	4	5
sound/soc/codecs/rt5640.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/fsl/fsl_ssi.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history