tree 214348d40ed547a72f9612a7e5c94a01afded812
parent f5d4c67e41a262f0cdfaec1bb0fa8e5952187ef9
parent c07f62e5f18123103459ff74e86af1518a5b8af5
author Takashi Iwai <tiwai@suse.de> 1228150937 +0100
committer Takashi Iwai <tiwai@suse.de> 1228150937 +0100

Merge branch 'upstream' into topic/asoc