Merge remote-tracking branches 'asoc/topic/rx51', 'asoc/topic/samsung', 'asoc/topic...

author Mark Brown <broonie@kernel.org>

Wed, 4 Feb 2015 20:57:18 +0000 (20:57 +0000)

committer Mark Brown <broonie@kernel.org>

Wed, 4 Feb 2015 20:57:18 +0000 (20:57 +0000)
author Mark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:18 +0000 (20:57 +0000)
committer Mark Brown <broonie@kernel.org>
Wed, 4 Feb 2015 20:57:18 +0000 (20:57 +0000)
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/generic/simple-card.c
Simple merge
diff --cc sound/soc/sh/fsi.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Wed, 4 Feb 2015 20:57:18 +0000 (20:57 +0000)
committer	Mark Brown <broonie@kernel.org>
	Wed, 4 Feb 2015 20:57:18 +0000 (20:57 +0000)
		1	2	3	4	5	6
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/generic/simple-card.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/sh/fsi.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history