Merge branch 'asoc-omap' into for-3.7
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 23 Aug 2012 14:41:24 +0000 (15:41 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 23 Aug 2012 14:41:24 +0000 (15:41 +0100)

Trivial merge