From: Mark Brown Date: Tue, 12 May 2015 19:31:32 +0000 (+0100) Subject: Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus X-Git-Tag: firefly_0821_release~176^2~1642^2~31^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=12a04231496502ab5950c8847e9cf0a28cbca1ad;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus --- 12a04231496502ab5950c8847e9cf0a28cbca1ad