Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 24 Nov 2010 11:22:55 +0000 (11:22 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 24 Nov 2010 11:22:55 +0000 (11:22 +0000)

Trivial merge