Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Fri, 24 Jun 2011 10:36:25 +0000 (12:36 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 24 Jun 2011 10:36:25 +0000 (12:36 +0200)
commite0938118576954ac4deafbdb9950cebd34f726c6
tree87000bd3ce37651b4b559489e7f1f6dbd4385e0c
parent16866741bda5d16f3d30d1656ce941faf5dad34c
parent53dea36c70c1857149a8c447224e3936eb8b5339
Merge branch 'fix/asoc' into for-linus