From: Mark Brown Date: Wed, 8 Oct 2014 15:44:49 +0000 (+0100) Subject: Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus X-Git-Tag: v3.18-rc1~5^2~4^2~1 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=699f8584305cb5b4ba69c6880c64be1f8f15a563;p=linux-block.git Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus --- 699f8584305cb5b4ba69c6880c64be1f8f15a563