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

author Mark Brown <[email protected]>

Mon, 6 Oct 2014 11:49:07 +0000 (12:49 +0100)

committer Mark Brown <[email protected]>

Mon, 6 Oct 2014 11:49:07 +0000 (12:49 +0100)
author Mark Brown <[email protected]>
Mon, 6 Oct 2014 11:49:07 +0000 (12:49 +0100)
committer Mark Brown <[email protected]>
Mon, 6 Oct 2014 11:49:07 +0000 (12:49 +0100)
diff --cc sound/soc/codecs/cs42l52.c
Simple merge
diff --cc sound/soc/codecs/da732x.c
Simple merge
diff --cc sound/soc/codecs/sgtl5000.c
Simple merge
diff --cc sound/soc/codecs/tlv320aic3x.c
Simple merge
author	Mark Brown <[email protected]>
	Mon, 6 Oct 2014 11:49:07 +0000 (12:49 +0100)
committer	Mark Brown <[email protected]>
	Mon, 6 Oct 2014 11:49:07 +0000 (12:49 +0100)
		1	2	3	4	5	6
sound/soc/codecs/cs42l52.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/da732x.c	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/codecs/tlv320aic3x.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history