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

author	Mark Brown <broonie@linaro.org>
	Mon, 4 Aug 2014 15:32:12 +0000 (16:32 +0100)
committer	Mark Brown <broonie@linaro.org>
	Mon, 4 Aug 2014 15:32:12 +0000 (16:32 +0100)
commit	c5e64c7636eb53495ee79916ca037fb97700eda0
tree	cff360fdc2bd0b5c6be7a1dbd1dcc3bb19a851ca	tree \| snapshot
parent	3510a6949546901cc97fd057e9c74975257375d2	commit \| diff
parent	7523a271682fc1f35355da344249ce8f8c8b8cb9	commit \| diff
parent	08074dc1ae8fe5e9b40b6dc26cbee4b04337750a	commit \| diff
parent	96665e312940a0915e74a98cf75938a57d12c723	commit \| diff
parent	423ca88eb5288d3bf381bd5b4601a496ab1ae463	commit \| diff

Merge remote-tracking branches 'asoc/topic/tlv', 'asoc/topic/tlv320aic23', 'asoc/topic/tlv320aic31xx' and 'asoc/topic/tlv320aic32x4' into asoc-next

include/sound/soc.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/Kconfig	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/tlv320aic31xx.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/soc-core.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history