Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 18 Nov 2009 15:38:58 +0000 (16:38 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 18 Nov 2009 15:38:58 +0000 (16:38 +0100)

Trivial merge