Merge branch 'fix/asoc' into for-linus
commitcf54d47c13c2b171f946289de445102c676d4258
authorTakashi Iwai <tiwai@suse.de>
Thu, 1 Dec 2011 15:32:18 +0000 (1 16:32 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 1 Dec 2011 15:32:18 +0000 (1 16:32 +0100)
treec7e88f33402257f3e06bc708e58843518d8ca17b
parent88d686027bb43f585914c77dd363f6e817b42c2a
parentbda63586bc5929e97288cdb371bb6456504867ed
Merge branch 'fix/asoc' into for-linus