Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
authorMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:51:57 +0000 (15:51 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 30 Aug 2015 14:51:57 +0000 (15:51 +0100)
commit4253f3a8f4c7835a95dbdef232ad81d0af88fab3
treed34d4181d30c3c4ec23da07826ec26df6a749cf9
parent24ecc23cf62a48ae47ccc40f0f226d45c962512e
parent6e588a0d839b51bae49852b68740a25cacc91978
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
sound/soc/soc-dapm.c
sound/soc/soc-topology.c