tree 64f8ad8b41513fda0710cc6097968f11d0083ce5
parent 2f36f5e1ffcc18deee234b9085fabd2828f59ee0
parent c88c2823e87dd6f8214b8b8cdc36d45f205a8077
author Takashi Iwai <tiwai@suse.de> 1295593814 +0100
committer Takashi Iwai <tiwai@suse.de> 1295593814 +0100

Merge branch 'fix/asoc' into for-linus