Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 3 May 2011 22:28:51 +0000 (23:28 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 3 May 2011 22:28:51 +0000 (23:28 +0100)

Trivial merge