Merge remote-tracking branch 'asoc/fix/omap' into asoc-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Dec 2012 15:21:41 +0000 (00:21 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 9 Dec 2012 15:21:41 +0000 (00:21 +0900)

Trivial merge