28162cefa1307
author Takashi Iwai <tiwai@suse.de> 1246626215 +0200
committer Takashi Iwai <tiwai@suse.de> 1246626215 +0200

Merge branch 'fix/hda' into topic/hda