git.openwrt.org Git - openwrt/staging/blogic.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	e7177999dc0f70000a6c54f77f2fa96abf9320a2
tree	1557da2e821196e5905573f068b8f396dc25d34a	tree \| snapshot
parent	01954a7b67021e5899dd85946ffe7609afbaa069	commit \| diff
parent	e365500459095276d19a920d5be1a65d0ef9999c	commit \| diff
parent	4e13eb722153a5ad66edd80bc26c3028d96a7b93	commit \| diff
parent	c7dfeed10928f00f8c99ad3b58a4f4c5cfd7c581	commit \| diff
parent	e5f89768e9bc1f441d18e2299518a2907e5017c9	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