Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 15 Dec 2011 11:56:04 +0000 (12:56 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 15 Dec 2011 11:56:04 +0000 (12:56 +0100)
commit844ec3142af3b8fd7b9aa95886015eabed80983e
tree77ad6fe364195d9ccb8ec661be937dfcad38b3a3
parent645e903528ca6cd510f9ac71a6a23de1a4d931e3
parent497d496598f411cb7f0690725a0e8b9029cebdb9
Merge branch 'fix/asoc' into for-linus