Merge branch 'topic/digital-mixing' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 24 Aug 2009 19:44:41 +0000 (20:44 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 24 Aug 2009 19:44:41 +0000 (20:44 +0100)

Trivial merge