4a68e421
parent f019ee5feb344ff0b22b58df4568676295aae14f
author Takashi Iwai <tiwai@suse.de> 1296835733 +0100
committer Takashi Iwai <tiwai@suse.de> 1296835733 +0100

Merge branch 'fix/asoc' into for-linus
…