Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Wed, 19 Oct 2011 15:20:08 +0000 (17:20 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 19 Oct 2011 15:20:08 +0000 (17:20 +0200)
1  2 
sound/pci/hda/hda_intel.c
sound/pci/hda/patch_conexant.c

Simple merge
Simple merge