aboutsummaryrefslogtreecommitdiff
path: root/sound/core/seq/seq_timer.c
diff options
context:
space:
mode:
authorGravatar Takashi Iwai <tiwai@suse.de> 2018-01-15 16:45:11 +0100
committerGravatar Takashi Iwai <tiwai@suse.de> 2018-01-15 16:45:15 +0100
commit4ea5553a51e55664f86bed29e62e67ecb45bedd8 (patch)
treeea63c963555b083858c581385ff5bfb24413caca /sound/core/seq/seq_timer.c
parentALSA: usb-audio: Add a quirk for Nura's first gen headset (diff)
parentALSA: seq: Make ioctls race-free (diff)
downloadlinux-4ea5553a51e55664f86bed29e62e67ecb45bedd8.tar.gz
linux-4ea5553a51e55664f86bed29e62e67ecb45bedd8.tar.bz2
linux-4ea5553a51e55664f86bed29e62e67ecb45bedd8.zip
Merge branch 'for-linus' into for-next
Back-merge to the development branch for further fixes of sequencer stuff. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/seq/seq_timer.c')
0 files changed, 0 insertions, 0 deletions