Merge branch 'fix/hda' into topic/hda
authorTakashi Iwai <tiwai@suse.de>
Mon, 31 Aug 2009 06:27:10 +0000 (08:27 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 31 Aug 2009 06:27:10 +0000 (08:27 +0200)
commitbe0ae923a40bbee8a0f02c1cd4b70656e729096f
treefa18d300c59e7845c08290346587186c2890cff7
parente9af4f365fee8065c0c1b2389fe10e540dd9d60a
parenta3f730af7e33cea10ea66f05b2565fde1f9512df
Merge branch 'fix/hda' into topic/hda

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