Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Dec 2010 15:53:31 +0000 (15:53 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 13 Dec 2010 15:53:31 +0000 (15:53 +0000)

Trivial merge