From: Mark Brown Date: Fri, 15 Aug 2014 11:51:28 +0000 (+0100) Subject: Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus X-Git-Tag: omap-for-v3.17/fixes-against-rc2~29^2~4^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a81cbefba91cb1a77170f8fbf082114590c3e14;p=pandora-kernel.git Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus --- 0a81cbefba91cb1a77170f8fbf082114590c3e14