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)
commitd0fa15e0987bb5444244db111d485fb8819ceba5
tree6dcee377eb73363b88438ebd7adee6e5d028c998
parent36e9c135e2c485cabb24084834ec29efe928bb5c
parent0bbaee3a58c379c4f7bab9635c71d7bad9c422a2
Merge branch 'fix/hda' into topic/hda
sound/pci/hda/patch_conexant.c
sound/pci/hda/patch_hdmi.c