Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 22 May 2011 02:31:51 +0000 (10:31 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 22 May 2011 02:31:51 +0000 (10:31 +0800)

Trivial merge