Merge remote-tracking branches 'asoc/topic/sta350', 'asoc/topic/tas2552', 'asoc/topic...

author Mark Brown <broonie@kernel.org>

Fri, 5 Jun 2015 17:55:03 +0000 (18:55 +0100)

committer Mark Brown <broonie@kernel.org>

Fri, 5 Jun 2015 17:55:03 +0000 (18:55 +0100)
author Mark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:55:03 +0000 (18:55 +0100)
committer Mark Brown <broonie@kernel.org>
Fri, 5 Jun 2015 17:55:03 +0000 (18:55 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/sta350.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 5 Jun 2015 17:55:03 +0000 (18:55 +0100)
committer	Mark Brown <broonie@kernel.org>
	Fri, 5 Jun 2015 17:55:03 +0000 (18:55 +0100)
		1	2	3	4	5
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/codecs/sta350.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history