Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/rockchip', 'asoc/topic...

author Mark Brown <broonie@kernel.org>

Mon, 8 Dec 2014 13:12:07 +0000 (13:12 +0000)

committer Mark Brown <broonie@kernel.org>

Mon, 8 Dec 2014 13:12:07 +0000 (13:12 +0000)
author Mark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:12:07 +0000 (13:12 +0000)
committer Mark Brown <broonie@kernel.org>
Mon, 8 Dec 2014 13:12:07 +0000 (13:12 +0000)
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/sh/rcar/core.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Mon, 8 Dec 2014 13:12:07 +0000 (13:12 +0000)
committer	Mark Brown <broonie@kernel.org>
	Mon, 8 Dec 2014 13:12:07 +0000 (13:12 +0000)
		1	2	3	4	5
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/sh/rcar/core.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history