From: Mark Brown Date: Tue, 22 Apr 2014 21:01:04 +0000 (+0100) Subject: Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus X-Git-Tag: v3.15-rc4~23^2~2^2~2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=31835046beba8890e34ea79ca7e5aa7811cbfa4a;p=users%2Fdwmw2%2Flinux.git Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus --- 31835046beba8890e34ea79ca7e5aa7811cbfa4a