Merge branch 'asoc-omap' into for-3.7
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 5 Sep 2012 12:05:11 +0000 (20:05 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 5 Sep 2012 12:05:11 +0000 (20:05 +0800)

Trivial merge