Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sun, 13 Feb 2011 09:05:30 +0000 (10:05 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sun, 13 Feb 2011 09:05:30 +0000 (10:05 +0100)

Trivial merge