Merge branch 'topic/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 3 May 2011 10:53:05 +0000 (12:53 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 3 May 2011 10:53:05 +0000 (12:53 +0200)

Trivial merge