Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Sun, 2 Jan 2011 10:01:55 +0000 (11:01 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sun, 2 Jan 2011 10:01:55 +0000 (11:01 +0100)

Trivial merge