git.baikalelectronics.ru Git - kernel.git/commit

author	Mark Brown <broonie@linaro.org>
	Mon, 4 Aug 2014 15:31:40 +0000 (16:31 +0100)
committer	Mark Brown <broonie@linaro.org>
	Mon, 4 Aug 2014 15:31:40 +0000 (16:31 +0100)
commit	4411e81bc7f5948bd61fe4c8fc266763c4d5bd42
tree	1557da2e821196e5905573f068b8f396dc25d34a	tree \| snapshot
parent	e9465a5e7776518983e4fc8d8d77ba67e52b89e5	commit \| diff
parent	6f2b4239ad1100c0ed2d09484f3c9e0e1f68bcf2	commit \| diff
parent	c90cd751b993300314e5e2a6848c0b5900c2fd56	commit \| diff
parent	c6161c70a7e30f4adc657568a1ca9cdf1309df46	commit \| diff
parent	29fe9e6db559b9561d65097ec0a2950211c53f82	commit \| diff

Merge remote-tracking branches 'asoc/topic/fsl', 'asoc/topic/fsl-asrc', 'asoc/topic/fsl-spdif' and 'asoc/topic/imx-audmux' into asoc-next

sound/soc/fsl/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/fsl/fsl_sai.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/fsl/fsl_spdif.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/fsl/fsl_ssi.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history