Merge branch 'peter/topic/for-mark/mcpdm_for-3.2' of git://gitorious.org/omap-audio...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 22 Sep 2011 10:25:58 +0000 (11:25 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 22 Sep 2011 10:25:58 +0000 (11:25 +0100)

Trivial merge