From: Mark Brown Date: Wed, 14 May 2014 11:52:32 +0000 (+0100) Subject: Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus X-Git-Tag: v3.15-rc6~25^2~3^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0d1203f29199a1d754bd1ca335c3dc6b14be160b;p=users%2Fjedix%2Flinux-maple.git Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus --- 0d1203f29199a1d754bd1ca335c3dc6b14be160b