summaryrefslogtreecommitdiff
path: root/sound/soc/soc-compress.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-01 18:01:00 +0300
committerTakashi Iwai <tiwai@suse.de>2019-07-01 18:01:55 +0300
commitb5c21c84705dbd96a0fff930d33022a17910b4f4 (patch)
treea080aa4383c8f4ffb91225d234ac9b530b2ff0fa /sound/soc/soc-compress.c
parent7c2b3629d09ddec810dc4c1d3a6657c32def8f71 (diff)
parent7fbd1753b64eafe21cf842348a40a691d0dee440 (diff)
downloadlinux-b5c21c84705dbd96a0fff930d33022a17910b4f4.tar.xz
Merge branch 'for-linus' into for-next
This back-merge is necessary for adjusting the latest FireWire fix with the recent refactoring in 5.3 development branch. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/soc-compress.c')
0 files changed, 0 insertions, 0 deletions