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