Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus
authorMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 13:17:13 +0000 (14:17 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 18 Oct 2013 13:17:13 +0000 (14:17 +0100)
commitd6ed31534552484a82f41176df644277dbc59e48
treef36540203b2b7e12a297ba8595f9e8cf99140721
parent762f9b185cde6ccadbaf5ca4d2a1c2535a89824b
parent2a577a7569182cc9a7fb0c91b3a5d031839806c8
Merge remote-tracking branch 'asoc/fix/omap' into asoc-linus