Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 10 Jun 2011 15:49:34 +0000 (17:49 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 10 Jun 2011 15:49:34 +0000 (17:49 +0200)
commit05e205429d3f73ad4f9f0d84e8a95e978237d6fd
tree558ded377d3deafcc8397b72ae6f696cdc55a713
parent7ab1fc0af3464d231e17eb729a03495d93d0cc5c
parent33195500edf260e8c8809ab9dfc67f50e0ce031f
Merge branch 'fix/asoc' into for-linus