summaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-01-07 18:52:46 +0100
committerTakashi Iwai <tiwai@suse.de>2021-01-07 18:52:58 +0100
commit6dcb8bf9a1d7f6d137a17b76177cd67e9b8e023d (patch)
treef73ca2bee2f77eb965f049d10e10636a0ff718a0 /sound/oss
parent64062869f0d63d118560c15f671376b43f71b102 (diff)
parent7b62275507232f01f66d3e7d05c77bbd9009b726 (diff)
downloadlinux-6dcb8bf9a1d7f6d137a17b76177cd67e9b8e023d.tar.bz2
Merge branch 'for-linus' into for-next
Back-merge of 5.11-devel branch for syncing the result changes. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss')
0 files changed, 0 insertions, 0 deletions