Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 23 Dec 2009 17:50:13 +0000 (18:50 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 23 Dec 2009 17:50:13 +0000 (18:50 +0100)

Trivial merge