Merge branch 'fix/hda' into topic/via-cleanup
authorTakashi Iwai <tiwai@suse.de>
Tue, 21 Jun 2011 05:34:00 +0000 (07:34 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 21 Jun 2011 05:34:45 +0000 (07:34 +0200)
commit216c7a0f22a088ff9f7c14f82c5bf93294875df9
tree2db768f30eac3aea06edff0bce5b3f9474bb5203
parentada509ec00e4ae1bfc4e0fa8a5c14091df920dbc
parente905a83acd7bf8989c3d5ba3099b72675f5d7d29
Merge branch 'fix/hda' into topic/via-cleanup

Conflicts:
sound/pci/hda/patch_via.c
sound/pci/hda/patch_realtek.c