Merge remote-tracking branch 'asoc/topic/pcm-list' into asoc-next

author Mark Brown <[email protected]>

Mon, 11 Jan 2016 13:54:31 +0000 (13:54 +0000)

committer Mark Brown <[email protected]>

Mon, 11 Jan 2016 13:54:31 +0000 (13:54 +0000)
author Mark Brown <[email protected]>
Mon, 11 Jan 2016 13:54:31 +0000 (13:54 +0000)
committer Mark Brown <[email protected]>
Mon, 11 Jan 2016 13:54:31 +0000 (13:54 +0000)
diff --cc include/sound/soc.h
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Mark Brown <[email protected]>
	Mon, 11 Jan 2016 13:54:31 +0000 (13:54 +0000)
committer	Mark Brown <[email protected]>
	Mon, 11 Jan 2016 13:54:31 +0000 (13:54 +0000)
		1	2
include/sound/soc.h	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history