Merge branch 'topic/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Wed, 23 Mar 2011 11:05:01 +0000 (12:05 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 23 Mar 2011 11:05:01 +0000 (12:05 +0100)

Trivial merge