Merge remote-tracking branch 'asoc/topic/omap' into for-3.7
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 15 Aug 2012 16:14:04 +0000 (17:14 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 15 Aug 2012 16:14:04 +0000 (17:14 +0100)

Trivial merge