Merge branch 'fix/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 2 Dec 2010 16:33:53 +0000 (17:33 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 2 Dec 2010 16:33:53 +0000 (17:33 +0100)
commit2ff38c9fbaa86264ad819117ab137361067ab5f1
tree154e163934796d5c82afdf0633ce3d197f6bb1f4
parentc949e3d685b661412bfcd93d9c5956f125c1e060
parentaf745bd724e304cc94a88a2fb43d53baffbd63a5
Merge branch 'fix/asoc' into for-linus