Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Wed, 8 Dec 2010 08:07:38 +0000 (09:07 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 8 Dec 2010 08:07:38 +0000 (09:07 +0100)
1  2 
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_hdmi.c

Simple merge
Simple merge