nt a98d3984c85222aa9efc63c4f9dd3d805ce469f2
parent 61bb42c37dfa9016dcacc86bcd41362ab2457d4a
author Takashi Iwai <tiwai@suse.de> 1275162636 +0200
committer Takashi Iwai <tiwai@suse.de> 1275162636 +0200

Merge branch 'fix/hda' into for-linus
�