Merge remote-tracking branches 'asoc/fix/davinci', 'asoc/fix/es8328', 'asoc/fix/fsl...

author Mark Brown <broonie@kernel.org>

Wed, 23 Dec 2015 00:23:27 +0000 (00:23 +0000)

committer Mark Brown <broonie@kernel.org>

Wed, 23 Dec 2015 00:23:27 +0000 (00:23 +0000)
author Mark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:27 +0000 (00:23 +0000)
committer Mark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:27 +0000 (00:23 +0000)
diff --cc sound/soc/davinci/davinci-mcasp.c
Simple merge
diff --cc sound/soc/fsl/fsl_sai.c
Simple merge
diff --cc sound/soc/rockchip/rockchip_spdif.c
Simple merge
diff --cc sound/soc/rockchip/rockchip_spdif.h
Simple merge
author	Mark Brown <broonie@kernel.org>
	Wed, 23 Dec 2015 00:23:27 +0000 (00:23 +0000)
committer	Mark Brown <broonie@kernel.org>
	Wed, 23 Dec 2015 00:23:27 +0000 (00:23 +0000)
		1	2	3	4	5	6	7
sound/soc/davinci/davinci-mcasp.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
sound/soc/fsl/fsl_sai.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
sound/soc/rockchip/rockchip_spdif.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history
sound/soc/rockchip/rockchip_spdif.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	blob \| history