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)

Trivial merge