Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Fri, 27 Feb 2009 16:47:31 +0000 (17:47 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 27 Feb 2009 16:47:31 +0000 (17:47 +0100)
commitf897497673ffd2895778d85df38a5071434309b4
tree5c7431ab4d7f31d99756459494f3ab4dc8752078
parentbedfcebb4fb33fc9ebd395462e72afa103db0bec
parentbb543c969467f33c3a1a0ccfcfcd9a508cd81c54
Merge branch 'fix/hda' into topic/hda

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