Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ac97', 'asoc/topic...

author Mark Brown <[email protected]>

Sun, 30 Aug 2015 14:52:21 +0000 (15:52 +0100)

committer Mark Brown <[email protected]>

Sun, 30 Aug 2015 14:52:21 +0000 (15:52 +0100)
author Mark Brown <[email protected]>
Sun, 30 Aug 2015 14:52:21 +0000 (15:52 +0100)
committer Mark Brown <[email protected]>
Sun, 30 Aug 2015 14:52:21 +0000 (15:52 +0100)
diff --cc include/sound/soc.h
Simple merge
diff --cc sound/soc/codecs/ak4642.c
Simple merge
diff --cc sound/soc/codecs/arizona.c
Simple merge
diff --cc sound/soc/codecs/arizona.h
Simple merge
author	Mark Brown <[email protected]>
	Sun, 30 Aug 2015 14:52:21 +0000 (15:52 +0100)
committer	Mark Brown <[email protected]>
	Sun, 30 Aug 2015 14:52:21 +0000 (15:52 +0100)
		1	2	3	4	5	6
include/sound/soc.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/ak4642.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/arizona.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
sound/soc/codecs/arizona.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history