Merge branch 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 9 Aug 2011 00:39:55 +0000 (09:39 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 9 Aug 2011 00:39:55 +0000 (09:39 +0900)

Trivial merge