git.kernelconcepts.de Git - karo-tx-linux.git/commit

author	Mark Brown <broonie@kernel.org>
	Mon, 6 Oct 2014 11:49:05 +0000 (12:49 +0100)
committer	Mark Brown <broonie@kernel.org>
	Mon, 6 Oct 2014 11:49:05 +0000 (12:49 +0100)
commit	248519c00eb239adc9a4a33e9970ccfea335b83a
tree	a7cf30f3187b4f6cf975ab63f9e9db0a1bfa923e	tree \| snapshot
parent	7370780cfd52552e570e4d252c75584c36378e4e	commit \| diff
parent	872bbb3aa35c2c73dee6ca13aeb5448b38b457ad	commit \| diff
parent	0d985b1c76623747107dbab1052044d6bac3866d	commit \| diff
parent	58a9014ae6422325f12d54b5dbb95531009ab70f	commit \| diff
parent	3b2a0013c7d49783d5ac3df9178e9907cd6ebd73	commit \| diff
parent	7c168d5f8bda5716e1a49040b901f26a3002517d	commit \| diff

Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/sirf', 'asoc/topic/spdif', 'asoc/topic/ssm2602' and 'asoc/topic/ssm4567' into asoc-next

sound/soc/codecs/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/Makefile	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/ssm2602.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/fsl/fsl_spdif.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history