Merge branch 'fix/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 9 Mar 2011 19:09:59 +0000 (20:09 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 9 Mar 2011 19:09:59 +0000 (20:09 +0100)

Trivial merge