aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace_functions.c
diff options
context:
space:
mode:
authorTakashi Iwai <[email protected]>2018-01-15 15:45:11 +0000
committerTakashi Iwai <[email protected]>2018-01-15 15:45:15 +0000
commit4ea5553a51e55664f86bed29e62e67ecb45bedd8 (patch)
treeea63c963555b083858c581385ff5bfb24413caca /kernel/trace/trace_functions.c
parentALSA: usb-audio: Add a quirk for Nura's first gen headset (diff)
parentALSA: seq: Make ioctls race-free (diff)
downloadkernel-4ea5553a51e55664f86bed29e62e67ecb45bedd8.tar.gz
kernel-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 <[email protected]>
Diffstat (limited to 'kernel/trace/trace_functions.c')
0 files changed, 0 insertions, 0 deletions