summaryrefslogtreecommitdiff
path: root/dissector_eth.h
diff options
context:
space:
mode:
Diffstat (limited to 'dissector_eth.h')
0 files changed, 0 insertions, 0 deletions
t.git/commit/sound?h=nds-private-remove&id=1f369d1655c1de415a186c6ce9004e40ca790989'>1f369d1655c1de415a186c6ce9004e40ca790989 (patch) tree71a9a75378c49301d321e45cacd54852a83b4d13 /sound parent7fe654dca20892f37226c31bdd2d5b932f8d843a (diff)parentaf677166cf63c179dc2485053166e02c4aea01eb (diff)
Merge tag 'sound-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "Here are some last-minute fixes: two fixes for races in ALSA sequencer queue spotted by syzkaller, a revert for a regression of LINE6 driver (since 4.9), and a trivial new codec ID addition for Nvidia HDMI" * tag 'sound-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hda - adding a new NV HDMI/DP codec ID in the driver ALSA: seq: Fix race at creating a queue Revert "ALSA: line6: Only determine control port properties if needed" ALSA: seq: Don't handle loop timeout at snd_seq_pool_done()
Diffstat (limited to 'sound')
-rw-r--r--sound/core/seq/seq_memory.c9
-rw-r--r--sound/core/seq/seq_queue.c33
-rw-r--r--sound/pci/hda/patch_hdmi.c1
-rw-r--r--sound/usb/line6/driver.c3
4 files changed, 24 insertions, 22 deletions
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c