Merge remote-tracking branches 'asoc/topic/blackfin', 'asoc/topic/davinci', 'asoc...

author Mark Brown <broonie@kernel.org>

Wed, 23 Sep 2015 18:01:19 +0000 (11:01 -0700)

committer Mark Brown <broonie@kernel.org>

Wed, 23 Sep 2015 18:01:19 +0000 (11:01 -0700)
author Mark Brown <broonie@kernel.org>
Wed, 23 Sep 2015 18:01:19 +0000 (11:01 -0700)
committer Mark Brown <broonie@kernel.org>
Wed, 23 Sep 2015 18:01:19 +0000 (11:01 -0700)
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
diff --cc sound/soc/davinci/davinci-mcasp.c
Simple merge
diff --cc sound/soc/fsl/fsl-asoc-card.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Wed, 23 Sep 2015 18:01:19 +0000 (11:01 -0700)
committer	Mark Brown <broonie@kernel.org>
	Wed, 23 Sep 2015 18:01:19 +0000 (11:01 -0700)
		1	2	3	4	5	6
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/Makefile	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/davinci/davinci-mcasp.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/fsl/fsl-asoc-card.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history