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	a33460f2a4ad80b31aa5fdaf49da804fad0e0d27
tree	1557da2e821196e5905573f068b8f396dc25d34a	tree \| snapshot
parent	aed87135563426bbe3270daf85f8b2a119ba0a66	commit \| diff
parent	b3c6ac8b70f6c0930f55bf5f097f11061039ee5e	commit \| diff
parent	1350407ad4ca4beefd02aa1ae0f5ad5e4cf9aa64	commit \| diff
parent	15910075783f842fa652cf9bada199fecef057d9	commit \| diff
parent	90cd71e2efc5b611cd0a207ff288eb5ed3776633	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