Merge branch 'fix/asoc' into for-linus
commit842a2097007b8a01a71a701300e970502a54bbb2
authorTakashi Iwai <tiwai@suse.de>
Fri, 21 Jan 2011 07:10:14 +0000 (21 08:10 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 21 Jan 2011 07:10:14 +0000 (21 08:10 +0100)
tree64f8ad8b41513fda0710cc6097968f11d0083ce5
parent2f36f5e1ffcc18deee234b9085fabd2828f59ee0
parentc88c2823e87dd6f8214b8b8cdc36d45f205a8077
Merge branch 'fix/asoc' into for-linus