diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-08-28 18:26:59 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-08-28 18:26:59 +0200 |
commit | a184d4e4591bb53fd8b91d6e8b85cffa261fb83e (patch) | |
tree | d8d530703e39fcfd612934105d5e1b5fab94d85c /sound/isa/msnd | |
parent | ALSA: hda - Make clear built-in driver optimization (diff) | |
parent | ALSA: hda - Don't trust codec EPSS bit for IDT 92HD83xx & co (diff) | |
download | linux-a184d4e4591bb53fd8b91d6e8b85cffa261fb83e.tar.xz linux-a184d4e4591bb53fd8b91d6e8b85cffa261fb83e.zip |
Merge branch 'for-linus' into for-next
Need to merge the fixes regarding EPSS.
Conflicts:
sound/pci/hda/hda_codec.c
Diffstat (limited to 'sound/isa/msnd')
0 files changed, 0 insertions, 0 deletions