Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 29 Mar 2010 20:00:04 +0000 (21:00 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 29 Mar 2010 20:00:04 +0000 (21:00 +0100)

Trivial merge