From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 25 Aug 2012 20:31:39 +0000 (-0700)
Subject: Merge branch 'asoc-omap' into for-3.7
X-Git-Tag: firefly_0821_release~3680^2~1589^2~52^2~148
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b10be23b88566c0f14889dd981ebfca1ef427b8b;p=firefly-linux-kernel-4.4.55.git

Merge branch 'asoc-omap' into for-3.7
---

b10be23b88566c0f14889dd981ebfca1ef427b8b