From: Mark Brown Date: Fri, 18 Oct 2013 13:17:13 +0000 (+0100) Subject: Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus X-Git-Tag: v3.12-rc7~24^2~1^2~4 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d6ed31534552484a82f41176df644277dbc59e48;p=users%2Fdwmw2%2Flinux.git Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus --- d6ed31534552484a82f41176df644277dbc59e48