Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 5 Oct 2010 16:55:56 +0000 (09:55 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 5 Oct 2010 16:55:56 +0000 (09:55 -0700)

Trivial merge