From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Thu, 4 Oct 2012 17:57:34 +0000 (+0100)
Subject: Merge branches 'asoc-twl6040' and 'asoc-omap' into for-3.7
X-Git-Tag: firefly_0821_release~3680^2~1589^2~52^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=68d114e1c68c25b383e917d5b979e52f481ad4bb;p=firefly-linux-kernel-4.4.55.git

Merge branches 'asoc-twl6040' and 'asoc-omap' into for-3.7
---

68d114e1c68c25b383e917d5b979e52f481ad4bb