From: Mark Brown Date: Thu, 15 Aug 2013 10:37:53 +0000 (+0100) Subject: Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus X-Git-Tag: firefly_0821_release~176^2~5489^2~4^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=14388a69348d14fb8fb02a2cbd0512af8902e912;p=firefly-linux-kernel-4.4.55.git Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus --- 14388a69348d14fb8fb02a2cbd0512af8902e912