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

author Mark Brown <[email protected]>

Tue, 3 Jun 2014 09:39:57 +0000 (10:39 +0100)

committer Mark Brown <[email protected]>

Tue, 3 Jun 2014 09:39:57 +0000 (10:39 +0100)
author Mark Brown <[email protected]>
Tue, 3 Jun 2014 09:39:57 +0000 (10:39 +0100)
committer Mark Brown <[email protected]>
Tue, 3 Jun 2014 09:39:57 +0000 (10:39 +0100)
diff --cc sound/soc/codecs/sgtl5000.c
Simple merge
diff --cc sound/soc/samsung/smdk_wm8994.c
Simple merge
author	Mark Brown <[email protected]>
	Tue, 3 Jun 2014 09:39:57 +0000 (10:39 +0100)
committer	Mark Brown <[email protected]>
	Tue, 3 Jun 2014 09:39:57 +0000 (10:39 +0100)
		1	2	3	4	5
sound/soc/codecs/sgtl5000.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/samsung/smdk_wm8994.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history