Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Mon, 13 Jun 2011 06:37:53 +0000 (08:37 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 13 Jun 2011 06:37:53 +0000 (08:37 +0200)
commit5ab775c7078533de0032fba3619d24e5cb9a6a34
tree5e66fed53a7311b2338b379581ccca027ef73802
parent8b0bd2266f9f8f7e7f192f2a5be164d7f637ce45
parent2308f4add3de9f6c9c9f02e49461e94d84bb200a
Merge branch 'fix/hda' into topic/hda
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_realtek.c