summaryrefslogtreecommitdiffstats
path: root/sound/isa/msnd
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-08-28 18:26:59 +0200
committerTakashi Iwai <tiwai@suse.de>2012-08-28 18:26:59 +0200
commita184d4e4591bb53fd8b91d6e8b85cffa261fb83e (patch)
treed8d530703e39fcfd612934105d5e1b5fab94d85c /sound/isa/msnd
parentALSA: hda - Make clear built-in driver optimization (diff)
parentALSA: hda - Don't trust codec EPSS bit for IDT 92HD83xx & co (diff)
downloadlinux-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