diff options
author | Takashi Iwai <tiwai@suse.de> | 2008-11-21 08:27:04 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-11-21 08:27:04 +0100 |
commit | 75a287d9a35a825cb758d2f8d8df93d41f9f8e3e (patch) | |
tree | 7aacf881315a16695e35ca810434e42666d26a55 /sound/pci/hda/hda_proc.c | |
parent | ALSA: hda - make laptop-eapd model back for AD1986A (diff) | |
parent | ALSA: hda: Add STAC_DELL_M4_3 quirk (diff) | |
download | linux-75a287d9a35a825cb758d2f8d8df93d41f9f8e3e.tar.xz linux-75a287d9a35a825cb758d2f8d8df93d41f9f8e3e.zip |
Merge branch 'topic/fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_sigmatel.c
Diffstat (limited to 'sound/pci/hda/hda_proc.c')
0 files changed, 0 insertions, 0 deletions