parent 5bd3729f6818721f76a2a2f7d2ecad899bace340
author Takashi Iwai <tiwai@suse.de> 1240331873 +0200
committer Takashi Iwai <tiwai@suse.de> 1240331873 +0200

Merge branch 'fix/hda' into topic/hda