Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 18 Mar 2011 10:51:13 +0000 (10:51 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 18 Mar 2011 10:51:13 +0000 (10:51 +0000)

Trivial merge