Merge remote-tracking branches 'asoc/topic/dpcm', 'asoc/topic/dt', 'asoc/topic/dwc...

author Mark Brown <[email protected]>

Sun, 24 Jul 2016 21:07:33 +0000 (22:07 +0100)

committer Mark Brown <[email protected]>

Sun, 24 Jul 2016 21:07:33 +0000 (22:07 +0100)
author Mark Brown <[email protected]>
Sun, 24 Jul 2016 21:07:33 +0000 (22:07 +0100)
committer Mark Brown <[email protected]>
Sun, 24 Jul 2016 21:07:33 +0000 (22:07 +0100)
diff --cc include/sound/soc-dapm.h
Simple merge
diff --cc sound/soc/soc-dapm.c
Simple merge
author	Mark Brown <[email protected]>
	Sun, 24 Jul 2016 21:07:33 +0000 (22:07 +0100)
committer	Mark Brown <[email protected]>
	Sun, 24 Jul 2016 21:07:33 +0000 (22:07 +0100)
		1	2	3	4	5
include/sound/soc-dapm.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
sound/soc/soc-dapm.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history