Merge remote-tracking branch 'asoc/topic/pcm-list' into asoc-next
authorMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:32 +0000 (00:23 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 23 Dec 2015 00:23:32 +0000 (00:23 +0000)
commita93202fa7b450a2783feecc571dcd0fee55c91c4
treeb72bba3a826552606a581850771f0f6f776a1566
parent3b88210da3a6af69e8bc7a6237e72c6ef5a2ca45
parent61b0088b6a5b98608ce00c18a057b1f5bcb5f8b3
Merge remote-tracking branch 'asoc/topic/pcm-list' into asoc-next
include/sound/soc.h
sound/soc/soc-core.c
sound/soc/soc-dapm.c