Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus

This commit is contained in:
Mark Brown 2016-02-10 19:23:01 +00:00
commit 2022d24e2b