diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-23 11:58:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-23 11:58:08 -0700 |
| commit | d038e3dcfff6e3de132726a9c7174d8170032aa4 (patch) | |
| tree | 8c54f69b6c8eb091d98c33cedf08ab819f5ecbf5 /net/sched/sch_dsmark.c | |
| parent | Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs (diff) | |
| parent | ALSA: hda - Adding a group of pin definition to fix headset problem (diff) | |
| download | linux-dev-d038e3dcfff6e3de132726a9c7174d8170032aa4.tar.xz linux-dev-d038e3dcfff6e3de132726a9c7174d8170032aa4.zip | |
Merge tag 'sound-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"This contains the collection of small fixes for 4.11 that were pending
during my vacation:
- a few HD-audio quirks (more Dell headset support, docking station
support on HP laptops)
- a regression fix for the previous ctxfi DMA mask fix
- a correction of the new CONFIG_SND_X86 menu entry
- a fix for the races in ALSA sequencer core spotted by syzkaller"
* tag 'sound-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Adding a group of pin definition to fix headset problem
ALSA: seq: Fix racy cell insertions during snd_seq_pool_done()
ALSA: x86: Make CONFIG_SND_X86 bool
ALSA: hda - add support for docking station for HP 840 G3
ALSA: hda - add support for docking station for HP 820 G2
ALSA: ctxfi: Fix the incorrect check of dma_set_mask() call
Diffstat (limited to 'net/sched/sch_dsmark.c')
0 files changed, 0 insertions, 0 deletions