Merge remote-tracking branch 'asoc/topic/pcm-list' into asoc-next
authorMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 13:54:31 +0000 (13:54 +0000)
committerMark Brown <broonie@kernel.org>
Mon, 11 Jan 2016 13:54:31 +0000 (13:54 +0000)
1  2 
include/sound/soc.h
sound/soc/soc-core.c

Simple merge
Simple merge