summaryrefslogtreecommitdiffstats
path: root/sound/soc/sof
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2020-01-26 09:31:34 +0100
committerTakashi Iwai <tiwai@suse.de>2020-01-26 09:31:41 +0100
commit9b132f2764e5a04bfb2e6c6f51cf5a729617d6a4 (patch)
tree986201af09ea4cd734ac5afa4a069cb9e56b78e9 /sound/soc/sof
parentALSA: cs46xx: fix spelling mistake "to" -> "too" (diff)
parentALSA: usb-audio: add quirks for Line6 Helix devices fw>=2.82 (diff)
downloadlinux-9b132f2764e5a04bfb2e6c6f51cf5a729617d6a4.tar.xz
linux-9b132f2764e5a04bfb2e6c6f51cf5a729617d6a4.zip
Merge branch 'for-linus' into for-next
Resolve conflicts and correct the hex numbers, too. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/sof')
0 files changed, 0 insertions, 0 deletions