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

author Mark Brown <broonie@linaro.org>

Fri, 25 Apr 2014 11:12:24 +0000 (12:12 +0100)

committer Mark Brown <broonie@linaro.org>

Fri, 25 Apr 2014 11:12:24 +0000 (12:12 +0100)
author Mark Brown <broonie@linaro.org>
Fri, 25 Apr 2014 11:12:24 +0000 (12:12 +0100)
committer Mark Brown <broonie@linaro.org>
Fri, 25 Apr 2014 11:12:24 +0000 (12:12 +0100)
diff --cc include/sound/soc.h
Simple merge
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
diff --cc sound/soc/codecs/sgtl5000.c
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Mark Brown <broonie@linaro.org>
	Fri, 25 Apr 2014 11:12:24 +0000 (12:12 +0100)
committer	Mark Brown <broonie@linaro.org>
	Fri, 25 Apr 2014 11:12:24 +0000 (12:12 +0100)
		1	2	3	4	5	6
include/sound/soc.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
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/codecs/sgtl5000.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history