Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 7 May 2010 15:38:26 +0000 (16:38 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 7 May 2010 15:38:26 +0000 (16:38 +0100)

Trivial merge