tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'fix/hda' into for-linus

Takashi Iwai 74ce25c0 86f2ce03

+1
unified split
+1
sound/pci/hda/hda_intel.c
··· 2332 */ 2333 static struct snd_pci_quirk msi_black_list[] __devinitdata = { 2334 SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ 2335 {} 2336 }; 2337
··· 2332 */ 2333 static struct snd_pci_quirk msi_black_list[] __devinitdata = { 2334 SND_PCI_QUIRK(0x1043, 0x81f2, "ASUS", 0), /* Athlon64 X2 + nvidia */ 2335 + SND_PCI_QUIRK(0x1043, 0x829c, "ASUS", 0), /* nvidia */ 2336 {} 2337 }; 2338