Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Mon, 10 May 2010 15:24:03 +0000 (17:24 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 10 May 2010 15:24:03 +0000 (17:24 +0200)
commit5433137336b049f1de8fc9a393991a49f1c1eb66
tree9cda5a81c4ce491e73fb302b4c751b6ce8f9e568
parent1965c441ecf1f9cd723dd590cbb6c191cfc13fb2
parent482c45331519524e4aeaf8a9084a445500822b85
Merge branch 'fix/hda' into topic/hda
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_realtek.c